Changeset 4208 for pjproject/trunk/pjlib/src/pj/hash.c

Timestamp:

Jul 18, 2012 7:52:33 AM (12 years ago)

Author:

ming

Message:

Fixed #1556: Fix From/To? tag and Via branch comparison to be case insensitive

File:

• pjproject/trunk/pjlib/src/pj/hash.c (modified) (8 diffs)

pjproject/trunk/pjlib/src/pj/hash.c

@@ -80 +80 @@
     for (i=0; i<key->slen; ++i) {
         pj_uint8_t c = key->ptr[i];
+        char lower;
         if (c & 64)
-            result[i] = (char)(c | 32);
+            lower = (char)(c | 32);
         else
-            result[i] = (char)c;
-        hval = hval * PJ_HASH_MULTIPLIER + result[i];
+            lower = (char)c;
+        if (result)
+            result[i] = lower;
+        hval = hval * PJ_HASH_MULTIPLIER + lower;
     }
 #else
     for (i=0; i<key->slen; ++i) {
-        result[i] = (char)pj_tolower(key->ptr[i]);
-        hval = hval * PJ_HASH_MULTIPLIER + result[i];
+        char lower = (char)pj_tolower(key->ptr[i]);
+        if (result)
+            result[i] = lower;
+        hval = hval * PJ_HASH_MULTIPLIER + lower;
     }
 #endif
@@ -129 +134 @@
                                    const void *key, unsigned keylen,
                                    void *val, pj_uint32_t *hval,
-                                   void *entry_buf)
+                                   void *entry_buf, pj_bool_t lower)
 {
     pj_uint32_t hash;
@@ -147 +152 @@
             const pj_uint8_t *p = (const pj_uint8_t*)key;
             for ( ; *p; ++p ) {
-                hash = hash * PJ_HASH_MULTIPLIER + *p;
+                if (lower)
+                    hash = hash * PJ_HASH_MULTIPLIER + pj_tolower(*p);
+                else 
+                    hash = hash * PJ_HASH_MULTIPLIER + *p;
             }
             keylen = p - (const unsigned char*)key;
@@ -154 +162 @@
                                   *end = p + keylen;
             for ( ; p!=end; ++p) {
-                hash = hash * PJ_HASH_MULTIPLIER + *p;
+                if (lower)
+                    hash = hash * PJ_HASH_MULTIPLIER + pj_tolower(*p);
+                else
+                    hash = hash * PJ_HASH_MULTIPLIER + *p;
             }
         }
@@ -168 +179 @@
          p_entry = &entry->next, entry = *p_entry)
     {
+        pj_str_t str;
+        
+        if (lower) {
+            str.ptr = (char *)entry->key;
+            str.slen = keylen;
+        }
         if (entry->hash==hash && entry->keylen==keylen &&
-            pj_memcmp(entry->key, key, keylen)==0) 
+            ((lower && pj_strnicmp2(&str, (const char *)key, keylen)==0) ||
+             (!lower && pj_memcmp(entry->key, key, keylen)==0)))
         {
             break;      
@@ -215 +233 @@
 {
     pj_hash_entry *entry;
-    entry = *find_entry( NULL, ht, key, keylen, NULL, hval, NULL);
+    entry = *find_entry( NULL, ht, key, keylen, NULL, hval, NULL, PJ_FALSE);
     return entry ? entry->value : NULL;
 }
 
-PJ_DEF(void) pj_hash_set( pj_pool_t *pool, pj_hash_table_t *ht,
-                          const void *key, unsigned keylen, pj_uint32_t hval,
-                          void *value )
+PJ_DEF(void *) pj_hash_get_lower( pj_hash_table_t *ht,
+                                  const void *key, unsigned keylen,
+                                  pj_uint32_t *hval)
+{
+    pj_hash_entry *entry;
+    entry = *find_entry( NULL, ht, key, keylen, NULL, hval, NULL, PJ_TRUE);
+    return entry ? entry->value : NULL;
+}
+
+static void hash_set( pj_pool_t *pool, pj_hash_table_t *ht,
+                      const void *key, unsigned keylen, pj_uint32_t hval,
+                      void *value, void *entry_buf, pj_bool_t lower )
 {
     pj_hash_entry **p_entry;
 
-    p_entry = find_entry( pool, ht, key, keylen, value, &hval, NULL);
+    p_entry = find_entry( pool, ht, key, keylen, value, &hval, entry_buf,
+                          lower);
     if (*p_entry) {
         if (value == NULL) {
@@ -242 +270 @@
 }
 
+PJ_DEF(void) pj_hash_set( pj_pool_t *pool, pj_hash_table_t *ht,
+                          const void *key, unsigned keylen, pj_uint32_t hval,
+                          void *value )
+{
+    hash_set(pool, ht, key, keylen, hval, value, NULL, PJ_FALSE);
+}
+
+PJ_DEF(void) pj_hash_set_lower( pj_pool_t *pool, pj_hash_table_t *ht,
+                                const void *key, unsigned keylen,
+                                pj_uint32_t hval, void *value )
+{
+    hash_set(pool, ht, key, keylen, hval, value, NULL, PJ_TRUE);
+}
+
 PJ_DEF(void) pj_hash_set_np( pj_hash_table_t *ht,
                              const void *key, unsigned keylen, 
@@ -247 +289 @@
                              void *value)
 {
-    pj_hash_entry **p_entry;
-
-    p_entry = find_entry( NULL, ht, key, keylen, value, &hval, 
-                         (void*)entry_buf );
-    if (*p_entry) {
-        if (value == NULL) {
-            /* delete entry */
-            PJ_LOG(6, ("hashtbl", "%p: p_entry %p deleted", ht, *p_entry));
-            *p_entry = (*p_entry)->next;
-            --ht->count;
-            
-        } else {
-            /* overwrite */
-            (*p_entry)->value = value;
-            PJ_LOG(6, ("hashtbl", "%p: p_entry %p value set to %p", ht, 
-                       *p_entry, value));
-        }
-    }
+    hash_set(NULL, ht, key, keylen, hval, value, (void *)entry_buf, PJ_FALSE);
+}
+
+PJ_DEF(void) pj_hash_set_np_lower( pj_hash_table_t *ht,
+                                   const void *key, unsigned keylen,
+                                   pj_uint32_t hval,
+                                   pj_hash_entry_buf entry_buf,
+                                   void *value)
+{
+    hash_set(NULL, ht, key, keylen, hval, value, (void *)entry_buf, PJ_TRUE);
 }