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/dissectors/packet-fddi.c | |
| parent | 9eda98dec91931588a003a6f707c4e2097369ba1 (diff) | |
| download | wireshark-86fe2be4dc2f5f5ff09e0d6c00277d7a9bf09ffd.tar.gz | |
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/dissectors/packet-fddi.c')
| -rw-r--r-- | epan/dissectors/packet-fddi.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-fddi.c b/epan/dissectors/packet-fddi.c index e66925a50e..abda0ff52e 100644 --- a/epan/dissectors/packet-fddi.c +++ b/epan/dissectors/packet-fddi.c @@ -368,9 +368,9 @@ dissect_fddi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tvb_memcpy(tvb, dst, FDDI_P_DHOST + FDDI_PADDING, 6); swap_mac_addr(dst_swapped, tvb, FDDI_P_DHOST + FDDI_PADDING); - SET_ADDRESS(&pinfo->dl_dst, AT_ETHER, 6, dst); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &pinfo->dl_dst); - COPY_ADDRESS_SHALLOW(&fddihdr->dst, &pinfo->dl_dst); + set_address(&pinfo->dl_dst, AT_ETHER, 6, dst); + copy_address_shallow(&pinfo->dst, &pinfo->dl_dst); + copy_address_shallow(&fddihdr->dst, &pinfo->dl_dst); if (fh_tree) { proto_tree_add_ether(fh_tree, hf_fddi_dst, tvb, FDDI_P_DHOST + FDDI_PADDING, 6, dst); @@ -391,9 +391,9 @@ dissect_fddi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tvb_memcpy(tvb, src, FDDI_P_SHOST + FDDI_PADDING, 6); swap_mac_addr(src_swapped, tvb, FDDI_P_SHOST + FDDI_PADDING); - SET_ADDRESS(&pinfo->dl_src, AT_ETHER, 6, src); - COPY_ADDRESS_SHALLOW(&pinfo->src, &pinfo->dl_src); - COPY_ADDRESS_SHALLOW(&fddihdr->src, &pinfo->dl_src); + set_address(&pinfo->dl_src, AT_ETHER, 6, src); + copy_address_shallow(&pinfo->src, &pinfo->dl_src); + copy_address_shallow(&fddihdr->src, &pinfo->dl_src); if (fh_tree) { proto_tree_add_ether(fh_tree, hf_fddi_src, tvb, FDDI_P_SHOST + FDDI_PADDING, 6, src); |