]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
[BUILD] memory: add a few missing parenthesis to the pool management macros
authorWilly Tarreau <w@1wt.eu>
Sun, 6 Jun 2010 10:07:32 +0000 (12:07 +0200)
committerWilly Tarreau <w@1wt.eu>
Mon, 14 Jun 2010 13:10:23 +0000 (15:10 +0200)
These missing ones caused a build error when a macro was called with
operations as the argument.

include/common/memory.h

index 765351ce2c2099dcc07dd381564dcea362c3cc9d..ae483ec73c5bd6819bd9d095e4c208ace23af787 100644 (file)
@@ -39,7 +39,7 @@
                 __p = malloc(((__len) >= sizeof (void *)) ? \
                       (__len) : sizeof(void *));            \
         else {                                              \
-                __pool = *(void **)(__pool);                \
+                (__pool) = *(void **)(__pool);             \
         }                                                   \
         __p;                                                \
 })
@@ -87,8 +87,8 @@
  */
 #define pool_free(type, ptr)                            \
 ({                                                      \
-        *(void **)ptr = (void *)pool_##type;            \
-        pool_##type = (void *)ptr;                      \
+        *(void **)(ptr) = (void *)pool_##type;         \
+        pool_##type = (void *)(ptr);                   \
 })
 
 #else
@@ -171,11 +171,11 @@ void *pool_destroy2(struct pool_head *pool);
 #define pool_alloc2(pool)                                       \
 ({                                                              \
         void *__p;                                              \
-        if ((__p = pool->free_list) == NULL)                    \
+        if ((__p = (pool)->free_list) == NULL)                 \
                 __p = pool_refill_alloc(pool);                  \
         else {                                                  \
-                pool->free_list = *(void **)pool->free_list;    \
-                pool->used++;                                   \
+                (pool)->free_list = *(void **)(pool)->free_list;\
+               (pool)->used++;                                 \
         }                                                       \
         __p;                                                    \
 })
@@ -192,9 +192,9 @@ void *pool_destroy2(struct pool_head *pool);
 #define pool_free2(pool, ptr)                           \
 ({                                                      \
         if (likely((ptr) != NULL)) {                    \
-                *(void **)ptr = (void *)pool->free_list;\
-                pool->free_list = (void *)ptr;          \
-                pool->used--;                           \
+                *(void **)(ptr) = (void *)(pool)->free_list;   \
+                (pool)->free_list = (void *)(ptr);     \
+                (pool)->used--;                                \
         }                                               \
 })