diff options
| author | Guy Harris <guy@alum.mit.edu> | 2007-04-26 01:01:27 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2007-04-26 01:01:27 +0000 |
| commit | bba0b0039261f84b52d731e74856e31be7556d4d (patch) | |
| tree | 10f8b7d91e5a7493c476cd106a39e260668a1e99 /epan/conversation.c | |
| parent | 1ed26d317caa512ae730a84e0b41bb35f7b10216 (diff) | |
Rename HASH_ADDRESS to ADD_ADDRESS_TO_HASH, to make it clearer what it
does (i.e., it will add the address bytes to the value that's already
there - it will not initialize the value, so you have to clear it before
doing any hashing).
svn path=/trunk/; revision=21578
Diffstat (limited to 'epan/conversation.c')
| -rw-r--r-- | epan/conversation.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/conversation.c b/epan/conversation.c index 42c6ddeb5b..065c4f2bb0 100644 --- a/epan/conversation.c +++ b/epan/conversation.c @@ -189,9 +189,9 @@ conversation_hash_exact(gconstpointer v) guint hash_val; hash_val = 0; - HASH_ADDRESS(hash_val, key->addr1); + ADD_ADDRESS_TO_HASH(hash_val, key->addr1); hash_val += key->port1; - HASH_ADDRESS(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; - HASH_ADDRESS(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; - HASH_ADDRESS(hash_val, key->addr1); + ADD_ADDRESS_TO_HASH(hash_val, key->addr1); hash_val += key->port1; - HASH_ADDRESS(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; - HASH_ADDRESS(hash_val, key->addr1); + ADD_ADDRESS_TO_HASH(hash_val, key->addr1); hash_val += key->port1; return hash_val; |