diff options
author | Evan Huus <eapache@gmail.com> | 2013-12-19 15:49:09 +0000 |
---|---|---|
committer | Evan Huus <eapache@gmail.com> | 2013-12-19 15:49:09 +0000 |
commit | a6415ece0ad102d30ac5dce59b127bcf1bd6d3f1 (patch) | |
tree | 0eff98882fe8c8a9db6f064b87330b8060fe37b2 /epan/dissectors/packet-cdp.c | |
parent | b7ab4db2108fda5a1370b807d1b03ad93b1ca8f8 (diff) |
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
Diffstat (limited to 'epan/dissectors/packet-cdp.c')
-rw-r--r-- | epan/dissectors/packet-cdp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-cdp.c b/epan/dissectors/packet-cdp.c index 0325a39f22..73416f768d 100644 --- a/epan/dissectors/packet-cdp.c +++ b/epan/dissectors/packet-cdp.c @@ -726,7 +726,7 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(tlv_tree, hf_cdp_tlvlength, tvb, offset + TLV_LENGTH, 2, ENC_BIG_ENDIAN); proto_tree_add_text(tlv_tree, tvb, offset + 4, length - 4, "System Object Identifier: %s", - tvb_bytes_to_str(tvb, offset + 4, length - 4)); + tvb_bytes_to_ep_str(tvb, offset + 4, length - 4)); } offset += length; break; @@ -986,7 +986,7 @@ dissect_address_tlv(tvbuff_t *tvb, int offset, int length, proto_tree *tree) if (length != 0) { proto_tree_add_text(address_tree, tvb, offset, length, "Protocol: %s (truncated)", - tvb_bytes_to_str(tvb, offset, length)); + tvb_bytes_to_ep_str(tvb, offset, length)); } return -1; } @@ -997,7 +997,7 @@ dissect_address_tlv(tvbuff_t *tvb, int offset, int length, proto_tree *tree) } else nlpid = -1; if (protocol_str == NULL) - protocol_str = tvb_bytes_to_str(tvb, offset, protocol_length); + protocol_str = tvb_bytes_to_ep_str(tvb, offset, protocol_length); proto_tree_add_text(address_tree, tvb, offset, protocol_length, "Protocol: %s", protocol_str); offset += protocol_length; @@ -1015,7 +1015,7 @@ dissect_address_tlv(tvbuff_t *tvb, int offset, int length, proto_tree *tree) if (length != 0) { proto_tree_add_text(address_tree, tvb, offset, length, "Address: %s (truncated)", - tvb_bytes_to_str(tvb, offset, length)); + tvb_bytes_to_ep_str(tvb, offset, length)); } return -1; } @@ -1041,7 +1041,7 @@ dissect_address_tlv(tvbuff_t *tvb, int offset, int length, proto_tree *tree) if (address_type_str == NULL) address_type_str = "Address"; if (address_str == NULL) { - address_str = tvb_bytes_to_str(tvb, offset, address_length); + address_str = tvb_bytes_to_ep_str(tvb, offset, address_length); } proto_item_set_text(ti, "%s: %s", address_type_str, address_str); proto_tree_add_text(address_tree, tvb, offset, address_length, "%s: %s", |