FT_BOOLEAN fields w/o bitmasks really should use BASE_NONE (not BASE_DEC,...).

[obnox/wireshark/wip.git] / capture-pcap-util.c

diff --git a/capture-pcap-util.c b/capture-pcap-util.c
index 12cbcf1ccad4e94b1ad8ac322e2a934304d04017..48b7989811f2f74af2a42c8ef136bf2835ae84be 100644 (file)
--- a/capture-pcap-util.c
+++ b/capture-pcap-util.c
@@ -336,8 +336,7 @@ free_if_cb(gpointer data, gpointer user_data _U_)
        if_info_t *if_info = data;
 
        g_free(if_info->name);
-       if (if_info->description != NULL)
-               g_free(if_info->description);
+       g_free(if_info->description);
 
        g_slist_foreach(if_info->ip_addr, free_if_info_addr_cb, NULL);
        g_slist_free(if_info->ip_addr);
@@ -532,7 +531,8 @@ get_pcap_linktype_list(const char *devname, char **err_str)
         *      http://www.winpcap.org/pipermail/winpcap-users/2008-May/002498.html
         */
 #ifndef _WIN32
-       free(linktypes);
+#define xx_free free  /* hack so checkAPIs doesn't complain */
+       xx_free(linktypes);
 #endif /* _WIN32 */
 #endif /* HAVE_PCAP_FREE_DATALINKS */
 #else /* HAVE_PCAP_LIST_DATALINKS */
@@ -550,8 +550,7 @@ free_linktype_cb(gpointer data, gpointer user_data _U_)
        data_link_info_t *linktype_info = data;
 
        g_free(linktype_info->name);
-       if (linktype_info->description != NULL)
-               g_free(linktype_info->description);
+       g_free(linktype_info->description);
 }
 
 void