From a6415ece0ad102d30ac5dce59b127bcf1bd6d3f1 Mon Sep 17 00:00:00 2001 From: Evan Huus Date: Thu, 19 Dec 2013 15:49:09 +0000 Subject: Rename a couple of to_str functions to have ep_ in the name. This makes it obvious that the returned string is ephemeral, and opens up the original names in the API for versions that take a wmem pool (and thus can work in any scope). svn path=/trunk/; revision=54249 --- epan/dissectors/packet-socketcan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'epan/dissectors/packet-socketcan.c') diff --git a/epan/dissectors/packet-socketcan.c b/epan/dissectors/packet-socketcan.c index c6ca25ed83..b37bce03df 100644 --- a/epan/dissectors/packet-socketcan.c +++ b/epan/dissectors/packet-socketcan.c @@ -145,7 +145,7 @@ dissect_socketcan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_add_fstr(pinfo->cinfo, COL_INFO, "%s: 0x%08x", val_to_str(frame_type, frame_type_vals, "Unknown (0x%02x)"), can_id.id); col_append_fstr(pinfo->cinfo, COL_INFO, " %s", - tvb_bytes_to_str_punct(tvb, CAN_DATA_OFFSET, frame_len, ' ')); + tvb_bytes_to_ep_str_punct(tvb, CAN_DATA_OFFSET, frame_len, ' ')); ti = proto_tree_add_item(tree, proto_can, tvb, 0, -1, ENC_NA); can_tree = proto_item_add_subtree(ti, ett_can); -- cgit v1.2.3