aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-csm-encaps.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-csm-encaps.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-csm-encaps.c')
-rw-r--r--epan/dissectors/packet-csm-encaps.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/epan/dissectors/packet-csm-encaps.c b/epan/dissectors/packet-csm-encaps.c
index 9c12bdb107..fc77342b19 100644
--- a/epan/dissectors/packet-csm-encaps.c
+++ b/epan/dissectors/packet-csm-encaps.c
@@ -155,11 +155,9 @@ static const gchar *
csm_fc(guint16 fc, guint16 ct)
{
if (fc == 0x0000) {
- return wmem_strdup(wmem_packet_scope(),
- val_to_str(ct, class_type_vals, "0x%04x"));
+ return val_to_str(ct, class_type_vals, "0x%04x");
} else {
- return wmem_strdup(wmem_packet_scope(),
- val_to_str(fc, function_code_vals, "0x%04x"));
+ return val_to_str(fc, function_code_vals, "0x%04x");
}
}