s3-registry: use some prs macros to the only place where they are used.

Guenther

diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h
index e5af20bac30871908673348816aacb0783290282..757c8a2c1e70a12e5494eb2e351ee3626aacb66f 100644 (file)
--- a/source3/include/smb_macros.h
+++ b/source3/include/smb_macros.h
@@ -273,8 +273,6 @@ NULL returns on zero request. JRA.
 
 #if defined(PARANOID_MALLOC_CHECKER)
 
-#define PRS_ALLOC_MEM(ps, type, count) (type *)prs_alloc_mem_((ps),sizeof(type),(count))
-
 /* Get medieval on our ass about malloc.... */
 
 /* Restrictions on malloc/realloc/calloc. */
@@ -311,8 +309,6 @@ NULL returns on zero request. JRA.
 
 #else
 
-#define PRS_ALLOC_MEM(ps, type, count) (type *)prs_alloc_mem((ps),sizeof(type),(count))
-
 /* Regular malloc code. */
 
 #define SMB_MALLOC(s) malloc(s)

diff --git a/source3/registry/regfio.c b/source3/registry/regfio.c
index 7a362d205e8cd5f505ddc76becf56bb6faeb9929..7ab262d822293f2b379e1fbf82a7b84c28f9b500 100644 (file)
--- a/source3/registry/regfio.c
+++ b/source3/registry/regfio.c
@@ -32,6 +32,12 @@
  *
  ******************************************************************/
 
+#if defined(PARANOID_MALLOC_CHECKER)
+#define PRS_ALLOC_MEM(ps, type, count) (type *)prs_alloc_mem_((ps),sizeof(type),(count))
+#else
+#define PRS_ALLOC_MEM(ps, type, count) (type *)prs_alloc_mem((ps),sizeof(type),(count))
+#endif
+
 /*******************************************************************
  Reads or writes an NTTIME structure.
 ********************************************************************/