From 86fe2be4dc2f5f5ff09e0d6c00277d7a9bf09ffd Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Wed, 21 Oct 2015 12:04:16 -0700 Subject: 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 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann --- epan/dissectors/packet-ldss.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'epan/dissectors/packet-ldss.c') diff --git a/epan/dissectors/packet-ldss.c b/epan/dissectors/packet-ldss.c index 1d04153ddc..55e61595c6 100644 --- a/epan/dissectors/packet-ldss.c +++ b/epan/dissectors/packet-ldss.c @@ -422,7 +422,7 @@ dissect_ldss_broadcast(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) data->file->digest_type = digest_type; data->broadcaster = wmem_new0(wmem_file_scope(), ldss_broadcaster_t); - COPY_ADDRESS(&data->broadcaster->addr, &pinfo->src); + copy_address(&data->broadcaster->addr, &pinfo->src); data->broadcaster->port = port; /* Dissect any future pushes/pulls */ @@ -786,8 +786,8 @@ is_broadcast(address* addr) 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; - SET_ADDRESS(&broadcast_addr, AT_ETHER, 6, broadcast_addr_bytes); - return ADDRESSES_EQUAL(addr, &broadcast_addr); + set_address(&broadcast_addr, AT_ETHER, 6, broadcast_addr_bytes); + return addresses_equal(addr, &broadcast_addr); } static int -- cgit v1.2.3