diff options
| author | Guy Harris <guy@alum.mit.edu> | 2008-06-23 20:15:30 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2008-06-23 20:15:30 +0000 |
| commit | 094911ef4f5a50e24c5827b37cf4141a11a9c28d (patch) | |
| tree | 4c5ba7adfee0838b77f104b074c8853f6b5c9405 | |
| parent | cb91244d0b702b43c00f05de91709430d824b06e (diff) | |
Rename arguments not to collide with function names, to avoid warnings
from -Wshadow, as noted by John Smith.
svn path=/trunk/; revision=25540
| -rw-r--r-- | epan/proto.c | 8 | ||||
| -rw-r--r-- | epan/proto.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/epan/proto.c b/epan/proto.c index 0ebac284c4..88bb3f3430 100644 --- a/epan/proto.c +++ b/epan/proto.c @@ -315,8 +315,8 @@ proto_compare_name(gconstpointer p1_arg, gconstpointer p2_arg) /* initialize data structures and register protocols and fields */ void -proto_init(void (register_all_protocols)(register_cb cb, gpointer client_data), - void (register_all_protocol_handoffs)(register_cb cb, gpointer client_data), +proto_init(void (register_all_protocols_func)(register_cb cb, gpointer client_data), + void (register_all_handoffs_func)(register_cb cb, gpointer client_data), register_cb cb, gpointer client_data) { @@ -355,7 +355,7 @@ proto_init(void (register_all_protocols)(register_cb cb, gpointer client_data), dissector tables, and dissectors to be called through a handle, and do whatever one-time initialization it needs to do. */ - register_all_protocols(cb, client_data); + register_all_protocols_func(cb, client_data); #ifdef HAVE_PLUGINS /* Now scan for plugins and load all the ones we find, calling @@ -370,7 +370,7 @@ proto_init(void (register_all_protocols)(register_cb cb, gpointer client_data), dissectors; those routines register the dissector in other dissectors' handoff tables, and fetch any dissector handles they need. */ - register_all_protocol_handoffs(cb, client_data); + register_all_handoffs_func(cb, client_data); #ifdef HAVE_PLUGINS /* Now do the same with plugins. */ diff --git a/epan/proto.h b/epan/proto.h index 546bc98667..44aff8e104 100644 --- a/epan/proto.h +++ b/epan/proto.h @@ -343,8 +343,8 @@ extern void proto_tree_children_foreach(proto_tree *tree, #define PTREE_DATA(proto_tree) ((proto_tree)->tree_data) /** Sets up memory used by proto routines. Called at program startup */ -extern void proto_init(void (register_all_protocols)(register_cb cb, gpointer client_data), - void (register_all_handoffs)(register_cb cb, gpointer client_data), +extern void proto_init(void (register_all_protocols_func)(register_cb cb, gpointer client_data), + void (register_all_handoffs_func)(register_cb cb, gpointer client_data), register_cb cb, void *client_data); |