diff options
| author | Guy Harris <guy@alum.mit.edu> | 2005-01-01 12:49:54 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2005-01-01 12:49:54 +0000 |
| commit | 4df2c4abd920cc579c6f5691670d4fc0e75c130a (patch) | |
| tree | 1053d7fbe4acc8c7db758d7e679c241bdc981c03 /tap-iostat.c | |
| parent | 5da116d531a127468b190e665c87a00197d68b1b (diff) | |
Make the signatures of functions passed to "register_tap_listener()"
match what "register_tap_listener()" expects (rather than squelching
warnings about the differences by casting function pointers to "void
*").
Make static some functions not used outside the module in which they're
defined.
svn path=/trunk/; revision=12913
Diffstat (limited to 'tap-iostat.c')
| -rw-r--r-- | tap-iostat.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tap-iostat.c b/tap-iostat.c index da84b631f6..e9cdac6284 100644 --- a/tap-iostat.c +++ b/tap-iostat.c @@ -67,8 +67,9 @@ typedef struct _io_stat_item_t { static int -iostat_packet(io_stat_item_t *mit, packet_info *pinfo, epan_dissect_t *edt _U_, void *dummy _U_) +iostat_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, void *dummy _U_) { + io_stat_item_t *mit = arg; io_stat_item_t *it; gint32 current_time; GPtrArray *gp; @@ -249,8 +250,9 @@ iostat_packet(io_stat_item_t *mit, packet_info *pinfo, epan_dissect_t *edt _U_, } static void -iostat_draw(io_stat_item_t *mit) +iostat_draw(void *arg) { + io_stat_item_t *mit = arg; io_stat_t *iot; io_stat_item_t **items; guint32 *frames; @@ -561,7 +563,7 @@ CALC_TYPE_MAX 4 CALC_TYPE_AVG 5 */ - error_string=register_tap_listener("frame", &io->items[i], flt, NULL, (void*)iostat_packet, i?NULL:(void*)iostat_draw); + error_string=register_tap_listener("frame", &io->items[i], flt, NULL, iostat_packet, i?NULL:iostat_draw); if(error_string){ g_free(io->items); g_free(io); @@ -650,4 +652,3 @@ register_tap_listener_iostat(void) { register_ethereal_tap("io,stat,", iostat_init); } - |