diff options
author | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2011-06-08 17:08:27 +0000 |
---|---|---|
committer | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2011-06-08 17:08:27 +0000 |
commit | 651e93c93a43fd99d7b32ccbc099b59f4b397dbc (patch) | |
tree | beec7795c10fc94a8a649389d1ae76a15ca8de5b | |
parent | fc5953724950f021bba01cda4b750351964ec498 (diff) |
The passed-in filter string can no longer be NULL, so use strlen instead of testing pointer.
svn path=/trunk/; revision=37621
-rw-r--r-- | gtk/mac_lte_stat_dlg.c | 6 | ||||
-rw-r--r-- | gtk/rlc_lte_stat_dlg.c | 6 |
2 files changed, 6 insertions, 6 deletions
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); } |