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-acn.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-acn.c')
| -rw-r--r-- | epan/dissectors/packet-acn.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-acn.c b/epan/dissectors/packet-acn.c index ae9f179205..7a1390e2e5 100644 --- a/epan/dissectors/packet-acn.c +++ b/epan/dissectors/packet-acn.c @@ -491,7 +491,7 @@ acn_add_address(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int off /* Append port and address to tree item */ IPv4 = tvb_get_ipv4(tvb, offset); SET_ADDRESS(&addr, AT_IPv4, sizeof(IPv4), &IPv4); - proto_item_append_text(pi, " %s, Port %d", address_to_str(&addr), port); + proto_item_append_text(pi, " %s, Port %d", ep_address_to_str(&addr), port); offset += 4; break; case ACN_ADDR_IPV6: @@ -509,7 +509,7 @@ acn_add_address(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int off /* Append port and address to tree item */ tvb_get_ipv6(tvb, offset, &IPv6); SET_ADDRESS(&addr, AT_IPv6, sizeof(struct e_in6_addr), &IPv6); - proto_item_append_text(pi, " %s, Port %d", address_to_str(&addr), port); + proto_item_append_text(pi, " %s, Port %d", ep_address_to_str(&addr), port); offset += 16; break; case ACN_ADDR_IPPORT: @@ -522,7 +522,7 @@ acn_add_address(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int off port = tvb_get_ntohs(tvb, offset); proto_tree_add_item(addr_tree, hf_acn_port, tvb, offset, 2, FALSE); /* Append port to tree item */ - proto_item_append_text(pi, " %s Port %d", address_to_str(&addr), port); + proto_item_append_text(pi, " %s Port %d", ep_address_to_str(&addr), port); offset += 2; break; } @@ -3028,7 +3028,7 @@ void proto_register_acn(void) "ACN", /* short name */ "acn" /* abbrev */ ); - + proto_register_field_array(proto_acn, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); |