More ADDRESS macro to address function conversions.

[metze/wireshark/wip.git] / epan / conversation.c

diff --git a/epan/conversation.c b/epan/conversation.c
index 1b9c95357eb41d0247bf71fe8e2b3306cd72fc9f..ab5cd5e312c8920248d5e66c5b464c3d8165768c 100644 (file)
--- a/epan/conversation.c
+++ b/epan/conversation.c
@@ -199,15 +199,15 @@ conversation_hash_exact(gconstpointer v)
        hash_val = 0;
        tmp_addr.len  = 4;
 
-       ADD_ADDRESS_TO_HASH(hash_val, &key->addr1);
+       add_address_to_hash(hash_val, &key->addr1);
 
        tmp_addr.data = &key->port1;
-       ADD_ADDRESS_TO_HASH(hash_val, &tmp_addr);
+       add_address_to_hash(hash_val, &tmp_addr);
 
-       ADD_ADDRESS_TO_HASH(hash_val, &key->addr2);
+       add_address_to_hash(hash_val, &key->addr2);
 
        tmp_addr.data = &key->port2;
-       ADD_ADDRESS_TO_HASH(hash_val, &tmp_addr);
+       add_address_to_hash(hash_val, &tmp_addr);
 
        hash_val += ( hash_val << 3 );
        hash_val ^= ( hash_val >> 11 );
@@ -282,13 +282,13 @@ conversation_hash_no_addr2(gconstpointer v)
        hash_val = 0;
        tmp_addr.len  = 4;
 
-       ADD_ADDRESS_TO_HASH(hash_val, &key->addr1);
+       add_address_to_hash(hash_val, &key->addr1);
 
        tmp_addr.data = &key->port1;
-       ADD_ADDRESS_TO_HASH(hash_val, &tmp_addr);
+       add_address_to_hash(hash_val, &tmp_addr);
 
        tmp_addr.data = &key->port2;
-       ADD_ADDRESS_TO_HASH(hash_val, &tmp_addr);
+       add_address_to_hash(hash_val, &tmp_addr);
 
        hash_val += ( hash_val << 3 );
        hash_val ^= ( hash_val >> 11 );
@@ -347,12 +347,12 @@ conversation_hash_no_port2(gconstpointer v)
        hash_val = 0;
        tmp_addr.len  = 4;
 
-       ADD_ADDRESS_TO_HASH(hash_val, &key->addr1);
+       add_address_to_hash(hash_val, &key->addr1);
 
        tmp_addr.data = &key->port1;
-       ADD_ADDRESS_TO_HASH(hash_val, &tmp_addr);
+       add_address_to_hash(hash_val, &tmp_addr);
 
-       ADD_ADDRESS_TO_HASH(hash_val, &key->addr2);
+       add_address_to_hash(hash_val, &key->addr2);
 
        hash_val += ( hash_val << 3 );
        hash_val ^= ( hash_val >> 11 );
@@ -411,10 +411,10 @@ conversation_hash_no_addr2_or_port2(gconstpointer v)
        hash_val = 0;
        tmp_addr.len  = 4;
 
-       ADD_ADDRESS_TO_HASH(hash_val, &key->addr1);
+       add_address_to_hash(hash_val, &key->addr1);
 
        tmp_addr.data = &key->port1;
-       ADD_ADDRESS_TO_HASH(hash_val, &tmp_addr);
+       add_address_to_hash(hash_val, &tmp_addr);
 
        hash_val += ( hash_val << 3 );
        hash_val ^= ( hash_val >> 11 );