summaryrefslogtreecommitdiff
path: root/ui/cli/tap-expert.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2015-02-03 23:27:01 -0500
committerAnders Broman <a.broman58@gmail.com>2015-02-04 06:58:49 +0000
commit90a76e0d51faed8aff875eafce0a85e39de6ae5f (patch)
tree8cbce2e1420d88f7586089f0999c902cfdb1015f /ui/cli/tap-expert.c
parent74547dba7e28a6fbc13cc2aa5d5327417357f075 (diff)
downloadwireshark-90a76e0d51faed8aff875eafce0a85e39de6ae5f.tar.gz
Convert val_to_str -> val_to_str_wmem.
This is mostly for GUI usage, but a few dissectors needed some "non-packet scope" conversions. val_to_str officially now uses wmem_packet_scope() Change-Id: Ic9413eeb3406d7a7683222b86709f3675d628d81 Reviewed-on: https://code.wireshark.org/review/6933 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui/cli/tap-expert.c')
-rw-r--r--ui/cli/tap-expert.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/ui/cli/tap-expert.c b/ui/cli/tap-expert.c
index 8ae358beaa..f90002ad2b 100644
--- a/ui/cli/tap-expert.c
+++ b/ui/cli/tap-expert.c
@@ -145,6 +145,7 @@ static void draw_items_for_severity(GArray *items, const gchar *label)
guint n;
expert_entry *ei;
int total = 0;
+ gchar *tmp_str;
/* Don't print title if no items */
if (items->len == 0) {
@@ -167,10 +168,12 @@ static void draw_items_for_severity(GArray *items, const gchar *label)
/* Items */
for (n=0; n < items->len; n++) {
ei = &g_array_index(items, expert_entry, n);
+ tmp_str = val_to_str_wmem(NULL, ei->group, expert_group_vals, "Unknown (%d)");
printf("%12u %10s %18s %s\n",
ei->frequency,
- val_to_str(ei->group, expert_group_vals, "Unknown"),
+ tmp_str,
ei->protocol, ei->summary);
+ wmem_free(NULL, tmp_str);
}
}