More ADDRESS macro to address function conversions.

Replace remaining calls to SET_ADDRESS, CMP_ADDRESS, ADDRESSES_EQUAL,
COPY_ADDRESS, and COPY_ADDRESS_SHALLOW with their lower-case
equivalents.

Replace all ADD_ADDRESS_TO_HASH calls with add_address_to_hash.

Change-Id: I4cff857d7a84085abe0bccd52d2605d2a468bf6f
Reviewed-on: https://code.wireshark.org/review/11229
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

3 files changed, 11 insertions, 11 deletions

diff --git a/plugins/profinet/packet-dcerpc-pn-io.c b/plugins/profinet/packet-dcerpc-pn-io.c
index 3016b4e3f8..69ebaceb97 100644
--- a/plugins/profinet/packet-dcerpc-pn-io.c
+++ b/plugins/profinet/packet-dcerpc-pn-io.c
@@ -2676,8 +2676,8 @@ pnio_ar_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, pnio_ar_t *ar)
         proto_tree *sub_tree;
         address   controllermac_addr, devicemac_addr;
 
-        SET_ADDRESS(&controllermac_addr, AT_ETHER, 6, ar->controllermac);
-        SET_ADDRESS(&devicemac_addr, AT_ETHER, 6, ar->devicemac);
+        set_address(&controllermac_addr, AT_ETHER, 6, ar->controllermac);
+        set_address(&devicemac_addr, AT_ETHER, 6, ar->devicemac);
 
         sub_tree = proto_tree_add_subtree_format(tree, tvb, 0, 0, ett_pn_io_ar_info, &sub_item,
             "ARUUID:%s ContrMAC:%s ContrAlRef:0x%x DevMAC:%s DevAlRef:0x%x InCR:0x%x OutCR=0x%x",
@@ -9683,8 +9683,8 @@ pn_io_ar_conv_filter(packet_info *pinfo)
         return NULL;
     }
 
-    SET_ADDRESS(&controllermac_addr, AT_ETHER, 6, ar->controllermac);
-    SET_ADDRESS(&devicemac_addr, AT_ETHER, 6, ar->devicemac);
+    set_address(&controllermac_addr, AT_ETHER, 6, ar->controllermac);
+    set_address(&devicemac_addr, AT_ETHER, 6, ar->devicemac);
 
     guid_str = guid_to_str(wmem_packet_scope(), (const e_guid_t*) &ar->aruuid);
     buf = g_strdup_printf(
@@ -9710,8 +9710,8 @@ pn_io_ar_conv_data_filter(packet_info *pinfo)
         return NULL;
     }
 
-    SET_ADDRESS(&controllermac_addr, AT_ETHER, 6, ar->controllermac);
-    SET_ADDRESS(&devicemac_addr, AT_ETHER, 6, ar->devicemac);
+    set_address(&controllermac_addr, AT_ETHER, 6, ar->controllermac);
+    set_address(&devicemac_addr, AT_ETHER, 6, ar->devicemac);
 
     controllermac_str = address_to_str(wmem_packet_scope(), &controllermac_addr);
     devicemac_str = address_to_str(wmem_packet_scope(), &devicemac_addr);
diff --git a/plugins/profinet/packet-dcom-cba-acco.c b/plugins/profinet/packet-dcom-cba-acco.c
index adf1882042..94de1f9ae2 100644
--- a/plugins/profinet/packet-dcom-cba-acco.c
+++ b/plugins/profinet/packet-dcom-cba-acco.c
@@ -425,7 +425,7 @@ cba_object_dump(void)
 
     for(pdevs = cba_pdevs; pdevs != NULL; pdevs = g_list_next(pdevs)) {
         pdev = pdevs->data;
-        SET_ADDRESS(&addr, AT_IPv4, 4, pdev->ip);
+        set_address(&addr, AT_IPv4, 4, pdev->ip);
         g_warning("PDev #%5u: %s IFs:%u", pdev->first_packet, address_to_str(wmem_packet_scope(), &addr),
             pdev->object ? g_list_length(pdev->object->interfaces) : 0);
 
@@ -641,7 +641,7 @@ cba_acco_add(packet_info *pinfo, const char *acco)
         return NULL;
     }
 
-    SET_ADDRESS(&addr, AT_IPv4, 4, &ip);
+    set_address(&addr, AT_IPv4, 4, &ip);
     pdev = cba_pdev_add(pinfo, &addr);
     delim++;
 
diff --git a/plugins/profinet/packet-pn-dcp.c b/plugins/profinet/packet-pn-dcp.c
index 4bb89bbec9..df681aa603 100644
--- a/plugins/profinet/packet-pn-dcp.c
+++ b/plugins/profinet/packet-pn-dcp.c
@@ -439,17 +439,17 @@ dissect_PNDCP_Suboption_IP(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
         /* IPAddress */
         offset = dissect_pn_ipv4(tvb, offset, pinfo, tree, hf_pn_dcp_suboption_ip_ip, &ip);
-        SET_ADDRESS(&addr, AT_IPv4, 4, &ip);
+        set_address(&addr, AT_IPv4, 4, &ip);
         proto_item_append_text(block_item, ", IP: %s", address_to_str(wmem_packet_scope(), &addr));
 
         /* Subnetmask */
         offset = dissect_pn_ipv4(tvb, offset, pinfo, tree, hf_pn_dcp_suboption_ip_subnetmask, &ip);
-        SET_ADDRESS(&addr, AT_IPv4, 4, &ip);
+        set_address(&addr, AT_IPv4, 4, &ip);
         proto_item_append_text(block_item, ", Subnet: %s", address_to_str(wmem_packet_scope(), &addr));
 
         /* StandardGateway */
         offset = dissect_pn_ipv4(tvb, offset, pinfo, tree, hf_pn_dcp_suboption_ip_standard_gateway, &ip);
-        SET_ADDRESS(&addr, AT_IPv4, 4, &ip);
+        set_address(&addr, AT_IPv4, 4, &ip);
         proto_item_append_text(block_item, ", Gateway: %s", address_to_str(wmem_packet_scope(), &addr));
         break;
     default: