aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-ipmi.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 /epan/dissectors/packet-ipmi.c
parent74547dba7e28a6fbc13cc2aa5d5327417357f075 (diff)
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 'epan/dissectors/packet-ipmi.c')
-rw-r--r--epan/dissectors/packet-ipmi.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/epan/dissectors/packet-ipmi.c b/epan/dissectors/packet-ipmi.c
index 1a0701adb2..7587eb4d2b 100644
--- a/epan/dissectors/packet-ipmi.c
+++ b/epan/dissectors/packet-ipmi.c
@@ -1269,9 +1269,11 @@ ipmi_fmt_channel(gchar *s, guint32 v)
{ 0x0f, "System Interface" },
{ 0, NULL }
};
+ gchar* tmp_str;
- g_snprintf(s, ITEM_LABEL_LENGTH, "%s (0x%02x)",
- val_to_str(v, chan_vals, "Channel #%d"), v);
+ tmp_str = val_to_str_wmem(NULL, v, chan_vals, "Channel #%d");
+ g_snprintf(s, ITEM_LABEL_LENGTH, "%s (0x%02x)", tmp_str, v);
+ wmem_free(NULL, tmp_str);
}
void