Changeset 3082 for pjproject/trunk/pjlib/src/pj/pool.c

Timestamp:

Jan 29, 2010 11:20:43 AM (14 years ago)

Author:

bennylp

Message:

More ticket #1037:

• bug in aligning pointer if sizeof(long) is less than sizeof(void*). Thanks John Ridges for pointing this out

File:

• pjproject/trunk/pjlib/src/pj/pool.c (modified) (4 diffs)

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

@@ -32 +32 @@
 #endif
 
-#define LOG(expr)   PJ_LOG(6,expr)
+#define LOG(expr)                       PJ_LOG(6,expr)
+#define ALIGN_PTR(PTR,ALIGNMENT)        (PTR + (-(long)(PTR) & (ALIGNMENT-1)))
 
 PJ_DEF_DATA(int) PJ_NO_MEMORY_EXCEPTION;
@@ -72 +73 @@
 
     /* Set the start pointer, aligning it as needed */
-    block->cur = (unsigned char*)
-                 (((unsigned long)block->buf + PJ_POOL_ALIGNMENT - 1) & 
-                  ~(PJ_POOL_ALIGNMENT - 1));
+    block->cur = ALIGN_PTR(block->buf, PJ_POOL_ALIGNMENT);
 
     /* Insert in the front of the list. */
@@ -217 +216 @@
 
     /* Set the start pointer, aligning it as needed */
-    block->cur = (unsigned char*)
-                 (((unsigned long)block->buf + PJ_POOL_ALIGNMENT - 1) &
-                  ~(PJ_POOL_ALIGNMENT - 1));
+    block->cur = ALIGN_PTR(block->buf, PJ_POOL_ALIGNMENT);
 
     pj_list_insert_after(&pool->block_list, block);
@@ -263 +260 @@
 
     /* Set the start pointer, aligning it as needed */
-    block->cur = (unsigned char*)
-                 (((unsigned long)block->buf + PJ_POOL_ALIGNMENT - 1) &
-                  ~(PJ_POOL_ALIGNMENT - 1));
+    block->cur = ALIGN_PTR(block->buf, PJ_POOL_ALIGNMENT);
 
     pool->capacity = block->end - (unsigned char*)pool;