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-dvbci.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/dissectors/packet-dvbci.c')
| -rw-r--r-- | epan/dissectors/packet-dvbci.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/epan/dissectors/packet-dvbci.c b/epan/dissectors/packet-dvbci.c index 800b404f9c..4360e4c2d4 100644 --- a/epan/dissectors/packet-dvbci.c +++ b/epan/dissectors/packet-dvbci.c @@ -1650,15 +1650,15 @@ dvbci_set_addrs(guint8 event, packet_info *pinfo) return -1; if (event == DVBCI_EVT_DATA_HOST_TO_CAM) { - SET_ADDRESS(&pinfo->src, AT_STRINGZ, + set_address(&pinfo->src, AT_STRINGZ, (int)strlen(ADDR_HOST)+1, ADDR_HOST); - SET_ADDRESS(&pinfo->dst, AT_STRINGZ, + set_address(&pinfo->dst, AT_STRINGZ, (int)strlen(ADDR_CAM)+1 , ADDR_CAM); } else { - SET_ADDRESS(&pinfo->src, AT_STRINGZ, + set_address(&pinfo->src, AT_STRINGZ, (int)strlen(ADDR_CAM)+1 , ADDR_CAM); - SET_ADDRESS(&pinfo->dst, AT_STRINGZ, + set_address(&pinfo->dst, AT_STRINGZ, (int)strlen(ADDR_HOST)+1, ADDR_HOST); } @@ -1673,12 +1673,12 @@ dvbci_get_evt_from_addrs(packet_info *pinfo) static const address a_cam = { AT_STRINGZ, sizeof(ADDR_CAM), ADDR_CAM }; static const address a_host = { AT_STRINGZ, sizeof(ADDR_HOST), ADDR_HOST }; - if ( ADDRESSES_EQUAL(&(pinfo->src), &a_cam) && - ADDRESSES_EQUAL(&(pinfo->dst), &a_host) ) { + if ( addresses_equal(&(pinfo->src), &a_cam) && + addresses_equal(&(pinfo->dst), &a_host) ) { return DVBCI_EVT_DATA_CAM_TO_HOST; } - else if ( ADDRESSES_EQUAL(&(pinfo->src), &a_host) && - ADDRESSES_EQUAL(&(pinfo->dst), &a_cam) ) { + else if ( addresses_equal(&(pinfo->src), &a_host) && + addresses_equal(&(pinfo->dst), &a_cam) ) { return DVBCI_EVT_DATA_HOST_TO_CAM; } else |