From 480089435746411ac973cc2d3146be6f7317ec5f Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Tue, 15 Jul 2014 13:15:27 -0700 Subject: Cleanup the "export PDU" common code. exp_pdu_file_open() isn't used outside ui/tap_export_pdu.c; make it static. do_export_pdu() isn't a tap routine, it's called *from* tap routines, so its last argument doesn't need to be a generic pointer; its last argument must be a pointer to an exp_pdu_t, so declare it as such. Clean up comments while we're at it. Change-Id: Iab51b54a0c272052d7876110a095f2fff66fa2c1 Reviewed-on: https://code.wireshark.org/review/3060 Reviewed-by: Guy Harris --- ui/gtk/export_pdu_dlg.c | 2 +- ui/qt/export_pdu_dialog.cpp | 1 + ui/tap_export_pdu.c | 7 +++---- ui/tap_export_pdu.h | 5 ++--- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/ui/gtk/export_pdu_dlg.c b/ui/gtk/export_pdu_dlg.c index b44232c814..1cc1b979e5 100644 --- a/ui/gtk/export_pdu_dlg.c +++ b/ui/gtk/export_pdu_dlg.c @@ -1,5 +1,5 @@ /* export_pdu_dlg.c - * Routines for exporting PDU:s to file + * Dialog for exporting PDUs to file * * Wireshark - Network traffic analyzer * By Gerald Combs diff --git a/ui/qt/export_pdu_dialog.cpp b/ui/qt/export_pdu_dialog.cpp index 83703eea95..42506a555c 100644 --- a/ui/qt/export_pdu_dialog.cpp +++ b/ui/qt/export_pdu_dialog.cpp @@ -1,4 +1,5 @@ /* export_pdu_dialog.cpp + * Dialog for exporting PDUs to file * * Wireshark - Network traffic analyzer * By Gerald Combs diff --git a/ui/tap_export_pdu.c b/ui/tap_export_pdu.c index a981b7e37c..86d92806a1 100644 --- a/ui/tap_export_pdu.c +++ b/ui/tap_export_pdu.c @@ -1,5 +1,5 @@ /* tap_export_pdu.c - * Routines for exporting PDU:s to file + * Routines for exporting PDUs to file * * Wireshark - Network traffic analyzer * By Gerald Combs @@ -80,7 +80,7 @@ export_pdu_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, co return FALSE; /* Do not redraw */ } -void +static void exp_pdu_file_open(exp_pdu_t *exp_pdu_tap_data) { int import_file_fd; @@ -188,10 +188,9 @@ end: } gboolean -do_export_pdu(const char *filter, gchar *tap_name, gpointer data) +do_export_pdu(const char *filter, gchar *tap_name, exp_pdu_t *exp_pdu_tap_data) { GString *error_string; - exp_pdu_t *exp_pdu_tap_data = (exp_pdu_t *)data; /* Register this tap listener now */ error_string = register_tap_listener(tap_name, /* The name of the tap we want to listen to */ diff --git a/ui/tap_export_pdu.h b/ui/tap_export_pdu.h index 25c39d733a..df6b5bad45 100644 --- a/ui/tap_export_pdu.h +++ b/ui/tap_export_pdu.h @@ -1,5 +1,5 @@ /* tap_export_pdu.h - * Routines for exporting PDU:s to file + * Routines for exporting PDUs to file * * Wireshark - Network traffic analyzer * By Gerald Combs @@ -32,8 +32,7 @@ typedef struct _exp_pdu_t { wtap_dumper* wdh; } exp_pdu_t; -void exp_pdu_file_open(exp_pdu_t *exp_pdu_tap_data); -gboolean do_export_pdu(const char *filter, gchar *tap_name, gpointer data); +gboolean do_export_pdu(const char *filter, gchar *tap_name, exp_pdu_t *data); #ifdef __cplusplus } -- cgit v1.2.3