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-devicenet.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'epan/dissectors/packet-devicenet.c') diff --git a/epan/dissectors/packet-devicenet.c b/epan/dissectors/packet-devicenet.c index 4412654b1d..d75f662cd2 100644 --- a/epan/dissectors/packet-devicenet.c +++ b/epan/dissectors/packet-devicenet.c @@ -461,7 +461,7 @@ static int dissect_devicenet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree /* Set source address */ src_address = (guint8*)wmem_alloc(pinfo->pool, 1); *src_address = (guint8)(can_id.id & MESSAGE_GROUP_1_MAC_ID_MASK); - SET_ADDRESS(&pinfo->src, devicenet_address_type, 1, (const void*)src_address); + set_address(&pinfo->src, devicenet_address_type, 1, (const void*)src_address); message_id = can_id.id & MESSAGE_GROUP_1_MSG_MASK; col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(message_id, devicenet_grp_msg1_vals, "Other Group 1 Message")); @@ -486,7 +486,7 @@ static int dissect_devicenet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree /* Set source address */ src_address = (guint8*)wmem_alloc(pinfo->pool, 1); *src_address = (guint8)((can_id.id & MESSAGE_GROUP_2_MAC_ID_MASK) >> 3); - SET_ADDRESS(&pinfo->src, devicenet_address_type, 1, (const void*)src_address); + set_address(&pinfo->src, devicenet_address_type, 1, (const void*)src_address); content_tree = proto_tree_add_subtree(devicenet_tree, tvb, offset, -1, ett_devicenet_contents, NULL, "Contents"); @@ -532,7 +532,7 @@ static int dissect_devicenet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree /* Set source address */ src_address = (guint8*)wmem_alloc(pinfo->pool, 1); *src_address = (guint8)(can_id.id & MESSAGE_GROUP_3_MAC_ID_MASK); - SET_ADDRESS(&pinfo->src, devicenet_address_type, 1, (const void*)src_address); + set_address(&pinfo->src, devicenet_address_type, 1, (const void*)src_address); message_id = can_id.id & MESSAGE_GROUP_3_MSG_MASK; col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(message_id, devicenet_grp_msg3_vals, "Unknown")); @@ -547,7 +547,7 @@ static int dissect_devicenet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree /* XXX - This may be source address depending on message type. Need to adjust accordingly) */ dest_address = (guint8*)wmem_alloc(pinfo->pool, 1); *dest_address = (guint8)source_mac; - SET_ADDRESS(&pinfo->dst, devicenet_address_type, 1, (const void*)dest_address); + set_address(&pinfo->dst, devicenet_address_type, 1, (const void*)dest_address); offset++; if (byte1 & MESSAGE_GROUP_3_FRAG_MASK) -- cgit v1.2.3