diff options
| author | Günther Deschner <gd@samba.org> | 2010-07-16 02:20:34 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2010-07-16 02:20:34 +0200 |
| commit | 914fd13eddef5cd917a10da1816565acfaa5fd57 (patch) | |
| tree | 01da45a29c5f129ab656e29401fac784632870a5 /source3 | |
| parent | 196b4e83424c65f8d56ef17e5fca1dfb11c9cf2b (diff) | |
| download | samba-914fd13eddef5cd917a10da1816565acfaa5fd57.tar.gz samba-914fd13eddef5cd917a10da1816565acfaa5fd57.tar.bz2 samba-914fd13eddef5cd917a10da1816565acfaa5fd57.zip | |
s3-registry: use some prs macros to the only place where they are used.
Guenther
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/include/smb_macros.h | 4 | ||||
| -rw-r--r-- | source3/registry/regfio.c | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h index e5af20bac3..757c8a2c1e 100644 --- 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 7a362d205e..7ab262d822 100644 --- 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. ********************************************************************/ |