diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-10-23 11:14:34 -0700 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-10-24 01:44:24 +0000 |
| commit | 4f39c603c2f0a2e429afedd18cd5c796bbbf8916 (patch) | |
| tree | b531dc21b1155c12e41722defdff2e73442ebab2 /asn1 | |
| parent | ae130f114cd61443c8c93e1c9280e027726a0235 (diff) | |
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>
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/atn-ulcs/packet-atn-ulcs-template.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asn1/atn-ulcs/packet-atn-ulcs-template.c b/asn1/atn-ulcs/packet-atn-ulcs-template.c index 6bf411ffab..5b7c04f8d2 100644 --- a/asn1/atn-ulcs/packet-atn-ulcs-template.c +++ b/asn1/atn-ulcs/packet-atn-ulcs-template.c @@ -511,10 +511,10 @@ atn_conversation_t * find_atn_conversation( guint32 key = 0; guint32 tmp = 0; - ADD_ADDRESS_TO_HASH( tmp, address1); + add_address_to_hash( tmp, address1); key = (tmp << 16) | clnp_ref1 ; - ADD_ADDRESS_TO_HASH( tmp, address2); + add_address_to_hash( tmp, address2); key = (tmp << 24) | key ; /* search for atn conversation */ @@ -537,10 +537,10 @@ atn_conversation_t * create_atn_conversation( guint32 key = 0; guint32 tmp = 0; - ADD_ADDRESS_TO_HASH( tmp, address1); + add_address_to_hash( tmp, address1); key = (tmp << 16) | clnp_ref1 ; - ADD_ADDRESS_TO_HASH( tmp, address2); + add_address_to_hash( tmp, address2); key = (tmp << 24) | key ; /* search for aircraft entry */ |