diff options
| author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-09-06 14:25:47 +0000 |
|---|---|---|
| committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-09-06 14:25:47 +0000 |
| commit | 8c48c6835fbfada96d2197bcbc7a87023bfc8291 (patch) | |
| tree | 2a60509a6637549f370b63ce3b27a3de8f9736d8 /epan/dissectors/packet-pagp.c | |
| parent | d6b920b8f6b22548e3828258ea11b2443af89ce4 (diff) | |
Rename address_to_str() to ep_address_to_str() because:
1) This indicates that the string has ephemeral lifetime
2) More consistent with its existing seasonal counterpart, se_address_to_str().
svn path=/trunk/; revision=29747
Diffstat (limited to 'epan/dissectors/packet-pagp.c')
| -rw-r--r-- | epan/dissectors/packet-pagp.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/epan/dissectors/packet-pagp.c b/epan/dissectors/packet-pagp.c index 315690200c..dcc87000d5 100644 --- a/epan/dissectors/packet-pagp.c +++ b/epan/dissectors/packet-pagp.c @@ -210,7 +210,7 @@ dissect_pagp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pagp_tree = proto_item_add_subtree(pagp_item, ett_pagp); proto_tree_add_uint(pagp_tree, hf_pagp_version_number, tvb, PAGP_VERSION_NUMBER, 1, raw_octet); - } + } if (check_col(pinfo->cinfo, COL_INFO)) { col_append_str(pinfo->cinfo, COL_INFO, val_to_str(raw_octet, pdu_vers, "Unknown PDU version")); @@ -221,7 +221,7 @@ dissect_pagp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) device_id.data = tvb_get_ptr(tvb, PAGP_FLUSH_LOCAL_DEVICE_ID, 6); if (check_col(pinfo->cinfo, COL_INFO)) { col_append_fstr(pinfo->cinfo, COL_INFO, "; Local DevID: %s", - address_to_str(&device_id)); + ep_address_to_str(&device_id)); } if (tree) { proto_tree_add_ether(pagp_tree, hf_pagp_flush_local_device_id, tvb, @@ -231,7 +231,7 @@ dissect_pagp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) device_id.data = tvb_get_ptr(tvb, PAGP_FLUSH_PARTNER_DEVICE_ID, 6); if (check_col(pinfo->cinfo, COL_INFO)) { col_append_fstr(pinfo->cinfo, COL_INFO, ", Partner DevID: %s", - address_to_str(&device_id)); + ep_address_to_str(&device_id)); } if (tree) { proto_tree_add_ether(pagp_tree, hf_pagp_flush_partner_device_id, tvb, @@ -287,7 +287,7 @@ dissect_pagp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) device_id.data = tvb_get_ptr(tvb, PAGP_LOCAL_DEVICE_ID, 6); if (check_col(pinfo->cinfo, COL_INFO)) { col_append_fstr(pinfo->cinfo, COL_INFO, "; Local DevID: %s", - address_to_str(&device_id)); + ep_address_to_str(&device_id)); } if (tree) { proto_tree_add_ether(pagp_tree, hf_pagp_local_device_id, tvb, @@ -319,7 +319,7 @@ dissect_pagp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) device_id.data = tvb_get_ptr(tvb, PAGP_PARTNER_DEVICE_ID, 6); if (check_col(pinfo->cinfo, COL_INFO)) { col_append_fstr(pinfo->cinfo, COL_INFO, ", Partner DevID: %s", - address_to_str(&device_id)); + ep_address_to_str(&device_id)); } if (tree) { proto_tree_add_ether(pagp_tree, hf_pagp_partner_device_id, tvb, @@ -369,7 +369,7 @@ dissect_pagp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tlv_item = proto_tree_add_text (pagp_tree, tvb, offset, len, "TLV Entry #%d", i); - + tlv_tree = proto_item_add_subtree (tlv_item, ett_pagp_tlvs); proto_tree_add_uint_format (tlv_tree, hf_pagp_tlv, tvb, offset,2,tlv,"Type = %d (%s)", tlv, @@ -381,7 +381,7 @@ dissect_pagp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) "TLV length too large"); return; } - + switch (tlv) { case PAGP_TLV_DEVICE_NAME: ch = tvb_get_ephemeral_string(tvb, offset+4, len-4); |