When invoking the mysql script, pass in $*

[bacula/bacula] / bacula / src / lib / mem_pool.h

diff --git a/bacula/src/lib/mem_pool.h b/bacula/src/lib/mem_pool.h
index 5378ea74116b53df85925ef952e4811862553a3d..96fa5a7de8aaea215eceab016c4d363c89a31654 100644 (file)
--- a/bacula/src/lib/mem_pool.h
+++ b/bacula/src/lib/mem_pool.h
@@ -25,30 +25,52 @@
 
  */
 
+#ifndef __MEM_POOL_H_
+#define __MEM_POOL_H_
+
+
 #ifdef SMARTALLOC
 
 #define get_pool_memory(pool) sm_get_pool_memory(__FILE__, __LINE__, pool)
 extern POOLMEM *sm_get_pool_memory(char *file, int line, int pool);
+
 #define get_memory(size) sm_get_memory(__FILE__, __LINE__, size)
-extern POOLMEM *sm_get_memory(char *fname, int line, size_t size);
+extern POOLMEM *sm_get_memory(char *fname, int line, int32_t size);
+
+#define sizeof_pool_memory(buf) sm_sizeof_pool_memory(__FILE__, __LINE__, buf)
+extern int32_t sm_sizeof_pool_memory(char *fname, int line, POOLMEM *buf);
+
+#define realloc_pool_memory(buf,size) sm_realloc_pool_memory(__FILE__, __LINE__, buf, size)
+extern POOLMEM  *sm_realloc_pool_memory(char *fname, int line, POOLMEM *buf, int32_t size);
+
+#define check_pool_memory_size(buf,size) sm_check_pool_memory_size(__FILE__, __LINE__, buf, size)
+extern POOLMEM  *sm_check_pool_memory_size(char *fname, int line, POOLMEM *buf, int32_t size);
+
+#define free_pool_memory(x) sm_free_pool_memory(__FILE__, __LINE__, x) 
+#define free_memory(x) sm_free_pool_memory(__FILE__, __LINE__, x) 
+extern void sm_free_pool_memory(char *fname, int line, POOLMEM *buf);
+
 
 #else
 
 extern POOLMEM *get_pool_memory(int pool);
-extern POOLMEM *get_memory(size_t size);
+extern POOLMEM *get_memory(int32_t size);
+extern int32_t sizeof_pool_memory(POOLMEM *buf);
+extern POOLMEM  *realloc_pool_memory(POOLMEM *buf, int32_t size);
+extern POOLMEM  *check_pool_memory_size(POOLMEM *buf, int32_t size);
+#define free_memory(x) free_pool_memory(x)
+extern void   free_pool_memory(POOLMEM *buf);
 
 #endif
  
-#define free_memory(x) free_pool_memory(x)
-extern void   free_pool_memory(POOLMEM *buf);
-extern size_t sizeof_pool_memory(POOLMEM *buf);
-extern POOLMEM *realloc_pool_memory(POOLMEM *buf, size_t size);
-extern POOLMEM *check_pool_memory_size(POOLMEM *buf, size_t size);
 extern void  close_memory_pool();
 extern void  print_memory_pool_stats();
 
-#define PM_NOPOOL  0                 /* nonpooled memory */
-#define PM_FNAME   1                 /* file name buffer */
-#define PM_MESSAGE 2                 /* daemon message */
-#define PM_EMSG    3                 /* error message */
-#define PM_MAX    PM_EMSG            /* Number of types */
+#define PM_NOPOOL  0                  /* nonpooled memory */
+#define PM_NAME    1                  /* Bacula name */
+#define PM_FNAME   2                  /* file name buffer */
+#define PM_MESSAGE 3                  /* daemon message */
+#define PM_EMSG    4                  /* error message */
+#define PM_MAX     PM_EMSG            /* Number of types */
+
+#endif