osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Rename arguments not to collide with function names, to avoid warnings 

from -Wshadow, as noted by John Smith.

svn path=/trunk/; revision=25540
This commit is contained in:
Guy Harris 2008-06-23 20:15:30 +00:00
parent cb91244d0b
commit 094911ef4f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
epan/proto.c
View File

@ -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. */

4
epan/proto.h
View File

@ -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);