diff options
| -rw-r--r-- | capchild/capture_ifinfo.c | 2 | ||||
| -rw-r--r-- | caputils/capture-wpcap.c | 12 |
2 files changed, 4 insertions, 10 deletions
diff --git a/capchild/capture_ifinfo.c b/capchild/capture_ifinfo.c index 30cb7d1b0e..3a25f2fa22 100644 --- a/capchild/capture_ifinfo.c +++ b/capchild/capture_ifinfo.c @@ -139,7 +139,7 @@ capture_interface_list(int *err, char **err_str, void (*update_cb)(void)) } g_free(secondary_msg); *err = CANT_GET_INTERFACE_LIST; - return NULL; + return if_list; } /* Split our lines */ diff --git a/caputils/capture-wpcap.c b/caputils/capture-wpcap.c index 3342276569..87262dcfa9 100644 --- a/caputils/capture-wpcap.c +++ b/caputils/capture-wpcap.c @@ -553,9 +553,7 @@ pcap_datalink_name_to_val(const char *name) { int i; - g_assert(has_wpcap); - - if (p_pcap_datalink_name_to_val != NULL) + if (has_wpcap && (p_pcap_datalink_name_to_val != NULL)) return p_pcap_datalink_name_to_val(name); else { /* @@ -605,9 +603,7 @@ pcap_datalink_val_to_name(int dlt) { int i; - g_assert(has_wpcap); - - if (p_pcap_datalink_val_to_name != NULL) + if (has_wpcap && (p_pcap_datalink_val_to_name != NULL)) return p_pcap_datalink_val_to_name(dlt); else { /* @@ -628,9 +624,7 @@ pcap_datalink_val_to_description(int dlt) { int i; - g_assert(has_wpcap); - - if (p_pcap_datalink_val_to_description != NULL) + if (has_wpcap && (p_pcap_datalink_val_to_description != NULL)) return p_pcap_datalink_val_to_description(dlt); else { /* |