Cleanup attribute catalog insert errors + cancel SD only once

[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 bd39d7500967c2b1e43ebbea914a10486ada2a1a..8926b2f2d3cd8a97da48eedb6320b99ea332db45 100644 (file)
--- a/bacula/src/lib/mem_pool.h
+++ b/bacula/src/lib/mem_pool.h
@@ -58,7 +58,6 @@ extern POOLMEM  *sm_check_pool_memory_size(const char *fname, int line, POOLMEM
 #define free_memory(x) sm_free_pool_memory(__FILE__, __LINE__, x)
 extern void sm_free_pool_memory(const char *fname, int line, POOLMEM *buf);
 
-
 #else
 
 extern POOLMEM *get_pool_memory(int pool);
@@ -71,6 +70,9 @@ extern void   free_pool_memory(POOLMEM *buf);
 
 #endif
 
+/* Macro to simplify free/reset pointers */
+#define free_and_null_pool_memory(a) do{if(a){free_pool_memory(a); (a)=NULL;}} while(0)
+
 extern void garbage_collect_memory_pool();
 extern void  close_memory_pool();
 extern void  print_memory_pool_stats();