diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-10-21 12:04:16 -0700 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-10-22 11:45:56 +0000 |
| commit | 86fe2be4dc2f5f5ff09e0d6c00277d7a9bf09ffd (patch) | |
| tree | 4aca52419f6ee7dc9a58ca8e4cd79fbeaa8d3387 /epan/proto.c | |
| parent | 9eda98dec91931588a003a6f707c4e2097369ba1 (diff) | |
Use address functions instead of ADDRESS macros in asn1 and epan
Replace CMP_ADDRESS, COPY_ADDRESS, et al with their lower-case
equivalents in the asn1 and epan directories.
Change-Id: I4043b0931d4353d60cffbd829e30269eb8d08cf4
Reviewed-on: https://code.wireshark.org/review/11200
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/proto.c')
| -rw-r--r-- | epan/proto.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/proto.c b/epan/proto.c index c4b0042c28..0cf1079747 100644 --- a/epan/proto.c +++ b/epan/proto.c @@ -4723,26 +4723,26 @@ proto_custom_set(proto_tree* tree, GSList *field_ids, gint occurrence, case FT_IPv4: ipv4 = (ipv4_addr *)fvalue_get(&finfo->value); n_addr = ipv4_get_net_order_addr(ipv4); - SET_ADDRESS (&addr, AT_IPv4, 4, &n_addr); + set_address (&addr, AT_IPv4, 4, &n_addr); address_to_str_buf(&addr, result+offset_r, size-offset_r); offset_r = (int)strlen(result); break; case FT_IPv6: ipv6 = (struct e_in6_addr *)fvalue_get(&finfo->value); - SET_ADDRESS (&addr, AT_IPv6, sizeof(struct e_in6_addr), ipv6); + set_address (&addr, AT_IPv6, sizeof(struct e_in6_addr), ipv6); address_to_str_buf(&addr, result+offset_r, size-offset_r); offset_r = (int)strlen(result); break; case FT_FCWWN: - SET_ADDRESS (&addr, AT_FCWWN, FCWWN_ADDR_LEN, fvalue_get(&finfo->value)); + set_address (&addr, AT_FCWWN, FCWWN_ADDR_LEN, fvalue_get(&finfo->value)); address_to_str_buf(&addr, result+offset_r, size-offset_r); offset_r = (int)strlen(result); break; case FT_ETHER: - SET_ADDRESS (&addr, AT_ETHER, FT_ETHER_LEN, fvalue_get(&finfo->value)); + set_address (&addr, AT_ETHER, FT_ETHER_LEN, fvalue_get(&finfo->value)); address_to_str_buf(&addr, result+offset_r, size-offset_r); offset_r = (int)strlen(result); break; |