diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-01-07 10:11:22 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-01-07 18:16:23 +0000 |
| commit | 64a7bac641d82aafaa0b65555008df647224ce00 (patch) | |
| tree | c1616eb10be7ec2938246773c4296f9ebd31c54e /epan/dissectors/packet-lldp.c | |
| parent | 98d3b1494bdc10d9e9cf3ab59bf5efa2e7c04b68 (diff) | |
tvb_bytes_to_ep_str -> tvb_bytes_to_str
Change-Id: I79c613cbdd8dc939dd4c29ebc477fb6eefd5bfc4
Reviewed-on: https://code.wireshark.org/review/6371
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-lldp.c')
| -rw-r--r-- | epan/dissectors/packet-lldp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-lldp.c b/epan/dissectors/packet-lldp.c index d470aa0de3..a071191ffc 100644 --- a/epan/dissectors/packet-lldp.c +++ b/epan/dissectors/packet-lldp.c @@ -1198,7 +1198,7 @@ dissect_lldp_chassis_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gui break; default: - strPtr = tvb_bytes_to_ep_str(tvb, offset, (dataLen-2)); + strPtr = tvb_bytes_to_str(wmem_packet_scope(), tvb, offset, (dataLen-2)); proto_tree_add_item(chassis_tree, hf_chassis_id, tvb, offset, (dataLen-2), ENC_NA); break; @@ -1231,7 +1231,7 @@ dissect_lldp_chassis_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gui break; case 1: /* Chassis component */ case 3: /* Port component */ - strPtr = tvb_bytes_to_ep_str(tvb, offset, (dataLen-1)); + strPtr = tvb_bytes_to_str(wmem_packet_scope(), tvb, offset, (dataLen-1)); break; default: @@ -1350,7 +1350,7 @@ dissect_lldp_port_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint3 break; default: - strPtr = tvb_bytes_to_ep_str(tvb, offset, (dataLen-2)); + strPtr = tvb_bytes_to_str(wmem_packet_scope(), tvb, offset, (dataLen-2)); proto_tree_add_item(port_tree, hf_port_id, tvb, offset, (dataLen-2), ENC_ASCII|ENC_NA); break; @@ -1374,7 +1374,7 @@ dissect_lldp_port_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint3 switch (tlvsubType) { case 2: /* Port component */ - strPtr = tvb_bytes_to_ep_str(tvb, offset, (dataLen-1)); + strPtr = tvb_bytes_to_str(wmem_packet_scope(), tvb, offset, (dataLen-1)); break; case 1: /* Interface alias */ case 5: /* Interface name */ |