summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2007-04-27 21:58:10 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:51:40 -0500
commit3477721278b97212d47ddddde6f0ab060406aea3 (patch)
tree5431e866ce39a0df9374a36930d4c1273729688f
parentb06fc3b53c2f17cfa3f86ef1472a5778400c0fc9 (diff)
downloadsamba-3477721278b97212d47ddddde6f0ab060406aea3.tar.gz
samba-3477721278b97212d47ddddde6f0ab060406aea3.tar.bz2
samba-3477721278b97212d47ddddde6f0ab060406aea3.zip
r22540: Added _strict varients of the macro calls - added
prototypes. Jeremy. (This used to be commit ba1a66cc6febed8b9c809c59562414675df5f74e)
-rw-r--r--source4/lib/talloc/talloc.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/source4/lib/talloc/talloc.h b/source4/lib/talloc/talloc.h
index fde2ddc0d8..357c9b5076 100644
--- a/source4/lib/talloc/talloc.h
+++ b/source4/lib/talloc/talloc.h
@@ -92,6 +92,7 @@ typedef void TALLOC_CTX;
/* Varient of talloc_zero that returns NULL if size is zero. */
#define talloc_zero_strict(ctx, type) (type *)_talloc_zero_strict(ctx, sizeof(type), #type)
#define talloc_zero_size(ctx, size) _talloc_zero(ctx, size, __location__)
+#define talloc_zero_size_strict(ctx, size) _talloc_zero_strict(ctx, size, __location__)
#define talloc_zero_array(ctx, type, count) (type *)_talloc_zero_array(ctx, sizeof(type), count, #type)
/* Varient of talloc_zero_array that returns NULL if count is zero. */
@@ -100,6 +101,7 @@ typedef void TALLOC_CTX;
/* Varient of talloc_array that returns NULL if count is zero. */
#define talloc_array_strict(ctx, type, count) (type *)_talloc_array_strict(ctx, sizeof(type), count, #type)
#define talloc_array_size(ctx, size, count) _talloc_array(ctx, size, count, __location__)
+#define talloc_array_size_strict(ctx, size, count) _talloc_array_strict(ctx, size, count, __location__)
#define talloc_array_ptrtype(ctx, ptr, count) (_TALLOC_TYPEOF(ptr))talloc_array_size(ctx, sizeof(*(ptr)), count)
#define talloc_realloc(ctx, p, type, count) (type *)_talloc_realloc_array(ctx, p, sizeof(type), count, #type)
@@ -160,7 +162,9 @@ void talloc_disable_null_tracking(void);
void talloc_enable_leak_report(void);
void talloc_enable_leak_report_full(void);
void *_talloc_zero(const void *ctx, size_t size, const char *name);
+void *_talloc_zero_strict(const void *ctx, size_t size, const char *name);
void *_talloc_memdup(const void *t, const void *p, size_t size, const char *name);
+void *_talloc_memdup_strict(const void *t, const void *p, size_t size, const char *name);
char *talloc_strdup(const void *t, const char *p);
char *talloc_strndup(const void *t, const char *p, size_t n);
char *talloc_append_string(const void *t, char *orig, const char *append);
@@ -169,7 +173,9 @@ char *talloc_vasprintf_append(char *s, const char *fmt, va_list ap) PRINTF_ATTRI
char *talloc_asprintf(const void *t, const char *fmt, ...) PRINTF_ATTRIBUTE(2,3);
char *talloc_asprintf_append(char *s, const char *fmt, ...) PRINTF_ATTRIBUTE(2,3);
void *_talloc_array(const void *ctx, size_t el_size, unsigned count, const char *name);
+void *_talloc_array_strict(const void *ctx, size_t el_size, unsigned count, const char *name);
void *_talloc_zero_array(const void *ctx, size_t el_size, unsigned count, const char *name);
+void *_talloc_zero_array_strict(const void *ctx, size_t el_size, unsigned count, const char *name);
void *_talloc_realloc_array(const void *ctx, void *ptr, size_t el_size, unsigned count, const char *name);
void *talloc_realloc_fn(const void *context, void *ptr, size_t size);
void *talloc_autofree_context(void);