From: martinm <martinm@f5534014-38df-0310-8fa8-9805f1628bb7>
Date: Wed, 8 Jun 2011 17:08:27 +0000 (+0000)
Subject: The passed-in filter string can no longer be NULL, so use strlen instead of testing... 
X-Git-Url: http://git.samba.org/samba.git/?p=obnox%2Fwireshark%2Fwip.git;a=commitdiff_plain;h=01611b499bfd233ec9f650f51d5591709a181bc0

The passed-in filter string can no longer be NULL, so use strlen instead of testing pointer.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37621 f5534014-38df-0310-8fa8-9805f1628bb7
---

diff --git a/gtk/mac_lte_stat_dlg.c b/gtk/mac_lte_stat_dlg.c
index 89feeb29fb..c0eaa7b49c 100644
--- a/gtk/mac_lte_stat_dlg.c
+++ b/gtk/mac_lte_stat_dlg.c
@@ -227,7 +227,7 @@ mac_lte_stat_reset(void *phs)
     if (mac_lte_stat->mac_lte_stat_dlg_w != NULL) {
         g_snprintf(title, sizeof(title), "Wireshark: LTE MAC Traffic Statistics: %s (filter=\"%s\")",
                    cf_get_display_name(&cfile),
-                   mac_lte_stat->filter ? mac_lte_stat->filter : "none");
+                   strlen(mac_lte_stat->filter) ? mac_lte_stat->filter : "none");
         gtk_window_set_title(GTK_WINDOW(mac_lte_stat->mac_lte_stat_dlg_w), title);
     }
 
@@ -683,7 +683,7 @@ mac_lte_stat_draw(void *phs)
                cf_get_display_name(&cfile),
                number_of_ues,
                hs->common_stats.all_frames,
-               hs->filter ? hs->filter : "none");
+               strlen(hs->filter) ? hs->filter : "none");
     gtk_window_set_title(GTK_WINDOW(hs->mac_lte_stat_dlg_w), title);
 
 
@@ -787,7 +787,7 @@ static void set_filter_expression(guint16  ueid,
     }
 
     /* Filter expression */
-    if (hs->filter) {
+    if (strlen(hs->filter)) {
         offset += g_snprintf(buffer+offset, MAX_FILTER_LEN-offset, "%s and ", hs->filter);
     }
 
diff --git a/gtk/rlc_lte_stat_dlg.c b/gtk/rlc_lte_stat_dlg.c
index 675cdadcea..cb6d6d85c1 100644
--- a/gtk/rlc_lte_stat_dlg.c
+++ b/gtk/rlc_lte_stat_dlg.c
@@ -277,7 +277,7 @@ rlc_lte_stat_reset(void *phs)
     if (rlc_lte_stat->dlg_w != NULL) {
         g_snprintf(title, sizeof(title), "Wireshark: LTE RLC Traffic Statistics: %s (filter=\"%s\")",
                    cf_get_display_name(&cfile),
-                   rlc_lte_stat->filter ? rlc_lte_stat->filter : "none");
+                   strlen(rlc_lte_stat->filter) ? rlc_lte_stat->filter : "none");
         gtk_window_set_title(GTK_WINDOW(rlc_lte_stat->dlg_w), title);
     }
 
@@ -740,7 +740,7 @@ rlc_lte_stat_draw(void *phs)
                cf_get_display_name(&cfile),
                number_of_ues,
                hs->total_frames,
-               hs->filter ? hs->filter : "none");
+               strlen(hs->filter) ? hs->filter : "none");
     gtk_window_set_title(GTK_WINDOW(hs->dlg_w), title);
 
 
@@ -985,7 +985,7 @@ static void set_channel_filter_expression(guint16  ueid,
     }
 
     /* Include dialog filter */
-    if (hs->filter) {
+    if (strlen(hs->filter)) {
         offset += g_snprintf(buffer+offset, MAX_FILTER_LEN-offset, "%s and ", hs->filter);
     }