From 842a9b510074c896e54735e2e3a575ea802f23ea Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Fri, 26 Feb 2016 17:04:05 -0800 Subject: Replace extcap_interface_list() with append_extcap_interface_list(). Pull the "rebuild the list of extcap interfaces and, optionally, return a list of if_infos for them" into a separate extcap_reload_interface_list() routine, call it in the cases where we don't want the if_infos list, and have append_extcap_interface_list() call it, asking it for the if_infos list, and then append the interfaces to that list. Change-Id: I07478ab133859484b3e0916144971639f961224b Reviewed-on: https://code.wireshark.org/review/14189 Reviewed-by: Guy Harris --- capchild/capture_ifinfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'capchild') diff --git a/capchild/capture_ifinfo.c b/capchild/capture_ifinfo.c index 5c4f299415..3d848814d9 100644 --- a/capchild/capture_ifinfo.c +++ b/capchild/capture_ifinfo.c @@ -200,7 +200,7 @@ capture_interface_list(int *err, char **err_str, void (*update_cb)(void)) #ifdef HAVE_EXTCAP /* Add the extcap interfaces after the native and remote interfaces */ g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_MESSAGE, "Loading External Capture Interface List ..."); - extcap_interface_list(&if_list, err_str); + if_list = append_extcap_interface_list(if_list, err_str); #endif return if_list; -- cgit v1.2.1