diff options
| -rw-r--r-- | epan/addr_resolv.c | 6 | ||||
| -rw-r--r-- | epan/addr_resolv.h | 3 | ||||
| -rw-r--r-- | tshark.c | 6 | ||||
| -rw-r--r-- | ui/gtk/main.c | 2 |
4 files changed, 8 insertions, 9 deletions
diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c index 4d65a50cda..bf959b5900 100644 --- a/epan/addr_resolv.c +++ b/epan/addr_resolv.c @@ -2525,7 +2525,7 @@ host_name_lookup_init(void) { #ifdef HAVE_C_ARES gboolean -host_name_lookup_process(gpointer data _U_) { +host_name_lookup_process(void) { async_dns_queue_msg_t *caqm; struct timeval tv = { 0, 0 }; int nfds; @@ -2594,7 +2594,7 @@ host_name_lookup_cleanup(void) { * - Do we need to keep our query structures around? */ gboolean -host_name_lookup_process(gpointer data _U_) { +host_name_lookup_process(void) { async_dns_queue_msg_t *almsg; GList *cur; char addr_str[] = "111.222.333.444.in-addr.arpa."; @@ -2667,7 +2667,7 @@ host_name_lookup_cleanup(void) { #else /* HAVE_GNU_ADNS */ gboolean -host_name_lookup_process(gpointer data _U_) { +host_name_lookup_process(void) { gboolean nro = new_resolved_objects; new_resolved_objects = FALSE; diff --git a/epan/addr_resolv.h b/epan/addr_resolv.h index 059d976935..11657c0448 100644 --- a/epan/addr_resolv.h +++ b/epan/addr_resolv.h @@ -127,11 +127,10 @@ extern void host_name_lookup_init(void); * This is called from a GLIB timeout in Wireshark and before processing * each packet in TShark. * - * @param data Ignored. * @return True if any new objects have been resolved since the previous * call. This can be used to trigger a display update, e.g. in Wireshark. */ -extern gboolean host_name_lookup_process(gpointer data); +extern gboolean host_name_lookup_process(void); /* host_name_lookup_cleanup cleans up an ADNS socket if we're using ADNS */ extern void host_name_lookup_cleanup(void); @@ -2546,7 +2546,7 @@ process_packet_first_pass(capture_file *cf, if (gbl_resolv_flags.mac_name || gbl_resolv_flags.network_name || gbl_resolv_flags.transport_name || gbl_resolv_flags.concurrent_dns) /* Grab any resolved addresses */ - host_name_lookup_process(NULL); + host_name_lookup_process(); /* If we're going to be applying a read filter, we'll need to create a protocol tree against which to apply the filter. */ @@ -2611,7 +2611,7 @@ process_packet_second_pass(capture_file *cf, frame_data *fdata, if (gbl_resolv_flags.mac_name || gbl_resolv_flags.network_name || gbl_resolv_flags.transport_name || gbl_resolv_flags.concurrent_dns) /* Grab any resolved addresses */ - host_name_lookup_process(NULL); + host_name_lookup_process(); if (cf->rfcode || verbose || filtering_tap_listeners || (tap_flags & TL_REQUIRES_PROTO_TREE) || have_custom_cols(&cf->cinfo)) @@ -3066,7 +3066,7 @@ process_packet(capture_file *cf, gint64 offset, const struct wtap_pkthdr *whdr, if (print_packet_info && (gbl_resolv_flags.mac_name || gbl_resolv_flags.network_name || gbl_resolv_flags.transport_name || gbl_resolv_flags.concurrent_dns)) /* Grab any resolved addresses */ - host_name_lookup_process(NULL); + host_name_lookup_process(); if (cf->rfcode || verbose || filtering_tap_listeners || (tap_flags & TL_REQUIRES_PROTO_TREE) || have_custom_cols(&cf->cinfo)) diff --git a/ui/gtk/main.c b/ui/gtk/main.c index 7db990750e..5e83697c08 100644 --- a/ui/gtk/main.c +++ b/ui/gtk/main.c @@ -1339,7 +1339,7 @@ static gboolean resolv_update_cb(gpointer data _U_) { /* Anything new show up? */ - if (host_name_lookup_process(NULL)) { + if (host_name_lookup_process()) { if (gtk_widget_get_window(pkt_scrollw)) gdk_window_invalidate_rect(gtk_widget_get_window(pkt_scrollw), NULL, TRUE); if (gtk_widget_get_window(tv_scrollw)) |