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

Timestamp:

Apr 30, 2007 9:03:32 PM (17 years ago)

Author:

bennylp

Message:

Initial Symbian integration to trunk for pjlib

File:

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

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

@@ -56 +56 @@
 
     if (keylen==PJ_HASH_KEY_STRING) {
-        const unsigned char *p = key;
+        const pj_uint8_t *p = (const pj_uint8_t*)key;
         for ( ; *p; ++p ) {
             hash = (hash * PJ_HASH_MULTIPLIER) + *p;
         }
     } else {
-        const unsigned char *p = key,
-                            *end = p + keylen;
+        const pj_uint8_t *p = (const pj_uint8_t*)key,
+                              *end = p + keylen;
         for ( ; p!=end; ++p) {
             hash = (hash * PJ_HASH_MULTIPLIER) + *p;
@@ -104 +104 @@
     PJ_ASSERT_RETURN(sizeof(pj_hash_entry)==PJ_HASH_ENTRY_SIZE, NULL);
 
-    h = pj_pool_alloc(pool, sizeof(pj_hash_table_t));
+    h = PJ_POOL_ALLOC_T(pool, pj_hash_table_t);
     h->count = 0;
 
@@ -120 +120 @@
     
     h->rows = table_size;
-    h->table = pj_pool_calloc(pool, table_size+1, sizeof(pj_hash_entry*));
+    h->table = (pj_hash_entry**)
+               pj_pool_calloc(pool, table_size+1, sizeof(pj_hash_entry*));
     return h;
 }
@@ -143 +144 @@
         hash=0;
         if (keylen==PJ_HASH_KEY_STRING) {
-            const unsigned char *p = key;
+            const pj_uint8_t *p = (const pj_uint8_t*)key;
             for ( ; *p; ++p ) {
                 hash = hash * PJ_HASH_MULTIPLIER + *p;
@@ -149 +150 @@
             keylen = p - (const unsigned char*)key;
         } else {
-            const unsigned char *p = key,
-                                *end = p + keylen;
+            const pj_uint8_t *p = (const pj_uint8_t*)key,
+                                  *end = p + keylen;
             for ( ; p!=end; ++p) {
                 hash = hash * PJ_HASH_MULTIPLIER + *p;
@@ -180 +181 @@
      */
     if (entry_buf) {
-        entry = entry_buf;
+        entry = (pj_hash_entry*)entry_buf;
     } else {
         /* Pool must be specified! */
         PJ_ASSERT_RETURN(pool != NULL, NULL);
 
-        entry = pj_pool_alloc(pool, sizeof(pj_hash_entry));
+        entry = PJ_POOL_ALLOC_T(pool, pj_hash_entry);
         PJ_LOG(6, ("hashtbl", 
                    "%p: New p_entry %p created, pool used=%u, cap=%u",