diff options
| author | Guy Harris <guy@alum.mit.edu> | 2008-06-23 20:17:08 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2008-06-23 20:17:08 +0000 |
| commit | 4d879cd0b8d357a3ed4ab3b2205a5a8e4672ec12 (patch) | |
| tree | ef872467ebf1494017bf04d9b08d2285f34d8d4a | |
| parent | 094911ef4f5a50e24c5827b37cf4141a11a9c28d (diff) | |
Rename arguments not to collide with function names, to avoid warnings
from -Wshadow, as noted by John Smith.
svn path=/trunk/; revision=25541
| -rw-r--r-- | epan/epan.c | 7 | ||||
| -rw-r--r-- | epan/epan.h | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/epan/epan.c b/epan/epan.c index e981d48082..336530fa19 100644 --- a/epan/epan.c +++ b/epan/epan.c @@ -65,8 +65,8 @@ epan_get_version(void) { } void -epan_init(void (*register_all_protocols)(register_cb cb, gpointer client_data), - void (*register_all_handoffs)(register_cb cb, gpointer client_data), +epan_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, void (*report_failure)(const char *, va_list), @@ -91,7 +91,8 @@ epan_init(void (*register_all_protocols)(register_cb cb, gpointer client_data), tvbuff_init(); tap_init(); prefs_init(); - proto_init(register_all_protocols, register_all_handoffs, cb, client_data); + proto_init(register_all_protocols_func, register_all_handoffs_func, + cb, client_data); packet_init(); dfilter_init(); final_registration_all_protocols(); diff --git a/epan/epan.h b/epan/epan.h index 708510d82d..c8b72d080b 100644 --- a/epan/epan.h +++ b/epan/epan.h @@ -34,8 +34,8 @@ typedef struct _epan_dissect_t epan_dissect_t; #include "dfilter/dfilter.h" /* init the whole epan module, this is used to be called only once in a program */ -void epan_init(void (*register_all_protocols)(register_cb cb, gpointer client_data), - void (*register_all_handoffs)(register_cb cb, gpointer client_data), +void epan_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, void (*report_failure)(const char *, va_list), |