diff options
author | Luis Ontanon <luis.ontanon@gmail.com> | 2013-06-27 17:10:50 +0000 |
---|---|---|
committer | Luis Ontanon <luis.ontanon@gmail.com> | 2013-06-27 17:10:50 +0000 |
commit | 0bdc0efc46ec66a298306aae253225c702ed6bea (patch) | |
tree | 1d6db93f3252994330777f123cb3d038518080e9 /tshark.c | |
parent | b450609a5561db9ddfc23b41c742979f5c4b3a32 (diff) |
get main_window_update out of the way... pass an update_cb to the capture_sync stuff
... as per the XXX comment removed from tshark.c this was a mess to keep the linker
happy... I couldn't!
I did this without even understanding whether calling main_window_update was realy
necessary in most cases. I guess nothing or more specific update cbs would be best.
svn path=/trunk/; revision=50188
Diffstat (limited to 'tshark.c')
-rw-r--r-- | tshark.c | 13 |
1 files changed, 3 insertions, 10 deletions
@@ -1245,7 +1245,7 @@ main(int argc, char *argv[]) #endif case 'D': /* Print a list of capture devices and exit */ #ifdef HAVE_LIBPCAP - if_list = capture_interface_list(&err, &err_str); + if_list = capture_interface_list(&err, &err_str,NULL); if (if_list == NULL) { switch (err) { case CANT_GET_INTERFACE_LIST: @@ -1959,7 +1959,7 @@ main(int argc, char *argv[]) if_capabilities_t *caps; interface_opts = g_array_index(global_capture_opts.ifaces, interface_options, i); - caps = capture_get_if_capabilities(interface_opts.name, interface_opts.monitor_mode, &err_str); + caps = capture_get_if_capabilities(interface_opts.name, interface_opts.monitor_mode, &err_str, NULL); if (caps == NULL) { cmdarg_err("%s", err_str); g_free(err_str); @@ -2274,7 +2274,7 @@ capture(void) fflush(stderr); g_string_free(str, TRUE); - ret = sync_pipe_start(&global_capture_opts, &global_capture_session); + ret = sync_pipe_start(&global_capture_opts, &global_capture_session, NULL); if (!ret) return FALSE; @@ -2341,13 +2341,6 @@ capture(void) return TRUE; } - -/* XXX - move the call to main_window_update() out of capture_sync.c */ -/* dummy for capture_sync.c to make linker happy */ -void main_window_update(void) -{ -} - /* capture child detected an error */ void capture_input_error_message(capture_session *cap_session _U_, char *error_msg, char *secondary_error_msg) |