Changeset 2123 for pjproject/trunk/pjlib/src/pj/pool_dbg.c

Timestamp:

Jul 12, 2008 9:31:34 AM (16 years ago)

Author:

bennylp

Message:

Ticket 559 (minor): Update the pool alternative API (pool_alt.h) with the latest pool API

File:

• pjproject/trunk/pjlib/src/pj/pool_dbg.c (modified) (5 diffs)

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

@@ -20 +20 @@
 #include <pj/string.h>
 
-#if PJ_POOL_DEBUG
+#if PJ_HAS_POOL_ALT_API
 
 #if PJ_HAS_MALLOC_H
@@ -42 +42 @@
 
 
-struct pj_pool_mem
-{
-    struct pj_pool_mem *next;
-
-    /* data follows immediately */
-};
-
-
-struct pj_pool_t
-{
-    struct pj_pool_mem *first_mem;
-    pj_size_t           used_size;
-    pj_pool_callback   *cb;
-};
-
 
 int PJ_NO_MEMORY_EXCEPTION;
 
+
+PJ_DEF(int) pj_NO_MEMORY_EXCEPTION()
+{
+    return PJ_NO_MEMORY_EXCEPTION;
+}
 
 /* Create pool */
@@ -74 +64 @@
     PJ_UNUSED_ARG(line);
     PJ_UNUSED_ARG(factory);
-    PJ_UNUSED_ARG(name);
     PJ_UNUSED_ARG(initial_size);
     PJ_UNUSED_ARG(increment_size);
@@ -82 +71 @@
         return NULL;
 
+    if (name) {
+        pj_ansi_strncpy(pool->obj_name, name, sizeof(pool->obj_name));
+        pool->obj_name[sizeof(pool->obj_name)-1] = '\0';
+    } else {
+        strcpy(pool->obj_name, "altpool");
+    }
+
+    pool->factory = NULL;
     pool->first_mem = NULL;
     pool->used_size = 0;
@@ -185 +182 @@
                                   pj_pool_t *pool, pj_size_t sz)
 {
-    return pj_pool_calloc_imp(file, line, pool, 1, sz);
+    return pj_pool_calloc_imp(file, line, pool, 1, sz); 
 }
 
 
-#endif  /* PJ_POOL_DEBUG */
+
+#endif  /* PJ_HAS_POOL_ALT_API */