diff options
| author | Guy Harris <guy@alum.mit.edu> | 2007-04-26 04:30:41 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2007-04-26 04:30:41 +0000 |
| commit | f16cd039c979b410924e807fa06cc4f18c389bfa (patch) | |
| tree | d39a7589683a8f8a362fc7538349b0e0ebe57763 | |
| parent | 8b0bc56f2c8abb568ab2d808ba8e25f0eae077be (diff) | |
Make ADD_ADDRESS_TO_HASH() take a pointer to an address as an argument,
as the other address macros do.
svn path=/trunk/; revision=21588
| -rw-r--r-- | epan/address.h | 4 | ||||
| -rw-r--r-- | epan/conversation.c | 12 | ||||
| -rw-r--r-- | epan/dissectors/packet-iax2.c | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/epan/address.h b/epan/address.h index 237f0f27a8..d5bf5ed7d1 100644 --- a/epan/address.h +++ b/epan/address.h @@ -128,9 +128,9 @@ typedef struct _address { #define ADD_ADDRESS_TO_HASH(hash_val, addr) { \ const guint8 *ADD_ADDRESS_TO_HASH_data; \ int ADD_ADDRESS_TO_HASH_index; \ - ADD_ADDRESS_TO_HASH_data = (addr).data; \ + ADD_ADDRESS_TO_HASH_data = (addr)->data; \ for (ADD_ADDRESS_TO_HASH_index = 0; \ - ADD_ADDRESS_TO_HASH_index < (addr).len; \ + ADD_ADDRESS_TO_HASH_index < (addr)->len; \ ADD_ADDRESS_TO_HASH_index++) \ hash_val += ADD_ADDRESS_TO_HASH_data[ADD_ADDRESS_TO_HASH_index]; \ } diff --git a/epan/conversation.c b/epan/conversation.c index 065c4f2bb0..95e62c532e 100644 --- a/epan/conversation.c +++ b/epan/conversation.c @@ -189,9 +189,9 @@ conversation_hash_exact(gconstpointer v) guint hash_val; hash_val = 0; - ADD_ADDRESS_TO_HASH(hash_val, key->addr1); + ADD_ADDRESS_TO_HASH(hash_val, &key->addr1); hash_val += key->port1; - ADD_ADDRESS_TO_HASH(hash_val, key->addr2); + ADD_ADDRESS_TO_HASH(hash_val, &key->addr2); hash_val += key->port2; return hash_val; @@ -260,7 +260,7 @@ conversation_hash_no_addr2(gconstpointer v) guint hash_val; hash_val = 0; - ADD_ADDRESS_TO_HASH(hash_val, key->addr1); + ADD_ADDRESS_TO_HASH(hash_val, &key->addr1); hash_val += key->port1; hash_val += key->port2; @@ -314,9 +314,9 @@ conversation_hash_no_port2(gconstpointer v) guint hash_val; hash_val = 0; - ADD_ADDRESS_TO_HASH(hash_val, key->addr1); + ADD_ADDRESS_TO_HASH(hash_val, &key->addr1); hash_val += key->port1; - ADD_ADDRESS_TO_HASH(hash_val, key->addr2); + ADD_ADDRESS_TO_HASH(hash_val, &key->addr2); return hash_val; } @@ -368,7 +368,7 @@ conversation_hash_no_addr2_or_port2(gconstpointer v) guint hash_val; hash_val = 0; - ADD_ADDRESS_TO_HASH(hash_val, key->addr1); + ADD_ADDRESS_TO_HASH(hash_val, &key->addr1); hash_val += key->port1; return hash_val; diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c index 8bd07812e5..f3da747070 100644 --- a/epan/dissectors/packet-iax2.c +++ b/epan/dissectors/packet-iax2.c @@ -475,7 +475,7 @@ static guint iax_circuit_hash (gconstpointer v) guint hash_val; hash_val = 0; - ADD_ADDRESS_TO_HASH(hash_val, key->addr); + ADD_ADDRESS_TO_HASH(hash_val, &key->addr); hash_val += (guint)(key->ptype); hash_val += (guint)(key->port); hash_val += (guint)(key->callno); |