diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-06-07 11:10:15 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-06-09 12:40:08 +0200 |
| commit | 73b377432c5efb8451f09f6d25d8aa1b28c239c9 (patch) | |
| tree | 54b158384a1312337a966ab7e2a9fe697163b75d /source3/include | |
| parent | 8459391e31079066745a65c5f3c07f3899afdc0c (diff) | |
| download | samba-73b377432c5efb8451f09f6d25d8aa1b28c239c9.tar.gz samba-73b377432c5efb8451f09f6d25d8aa1b28c239c9.tar.bz2 samba-73b377432c5efb8451f09f6d25d8aa1b28c239c9.zip | |
s3-talloc Change TALLOC_REALLOC_ARRAY() to talloc_realloc()
Using the standard macro makes it easier to move code into common, as
TALLOC_REALLOC_ARRAY isn't standard talloc.
Andrew Bartlett
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/smb_macros.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h index ccf99daaea..cb364a9aa3 100644 --- a/source3/include/smb_macros.h +++ b/source3/include/smb_macros.h @@ -229,7 +229,6 @@ copy an IP address from one buffer to another #define TALLOC_ZERO_SIZE(ctx, size) _talloc_zero(ctx, size, __location__) #define TALLOC_REALLOC(ctx, ptr, count) _talloc_realloc(ctx, ptr, count, __location__) -#define TALLOC_REALLOC_ARRAY(ctx, ptr, type, count) (type *)_talloc_realloc_array(ctx, ptr, sizeof(type), count, #type) #define talloc_destroy(ctx) talloc_free(ctx) #ifndef TALLOC_FREE #define TALLOC_FREE(ctx) do { talloc_free(ctx); ctx=NULL; } while(0) @@ -292,7 +291,7 @@ copy an IP address from one buffer to another #define ADD_TO_ARRAY(mem_ctx, type, elem, array, num) \ do { \ *(array) = ((mem_ctx) != NULL) ? \ - TALLOC_REALLOC_ARRAY(mem_ctx, (*(array)), type, (*(num))+1) : \ + talloc_realloc(mem_ctx, (*(array)), type, (*(num))+1) : \ SMB_REALLOC_ARRAY((*(array)), type, (*(num))+1); \ SMB_ASSERT((*(array)) != NULL); \ (*(array))[*(num)] = (elem); \ |