diff options
| author | Robert Ransom <rransom.8774@gmail.com> | 2012-02-12 20:09:56 -0800 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-02-17 11:42:19 -0500 |
| commit | 806e0f7e19ed10f91b1a7477486991611c9732de (patch) | |
| tree | 7a03f6fc7f24017c8dad885c36101206bbad2415 /src/common/util.h | |
| parent | ff0059b924ec9bf1637eef81135b897da9210cc4 (diff) | |
| download | tor-806e0f7e19ed10f91b1a7477486991611c9732de.tar tor-806e0f7e19ed10f91b1a7477486991611c9732de.tar.gz | |
Add tor_calloc
Diffstat (limited to 'src/common/util.h')
| -rw-r--r-- | src/common/util.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/common/util.h b/src/common/util.h index 1bad24bf7..955a68283 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -73,6 +73,7 @@ void *_tor_malloc(size_t size DMALLOC_PARAMS) ATTR_MALLOC; void *_tor_malloc_zero(size_t size DMALLOC_PARAMS) ATTR_MALLOC; void *_tor_malloc_roundup(size_t *size DMALLOC_PARAMS) ATTR_MALLOC; +void *_tor_calloc(size_t nmemb, size_t size DMALLOC_PARAMS) ATTR_MALLOC; void *_tor_realloc(void *ptr, size_t size DMALLOC_PARAMS); char *_tor_strdup(const char *s DMALLOC_PARAMS) ATTR_MALLOC ATTR_NONNULL((1)); char *_tor_strndup(const char *s, size_t n DMALLOC_PARAMS) @@ -107,6 +108,7 @@ extern int dmalloc_free(const char *file, const int line, void *pnt, #define tor_malloc(size) _tor_malloc(size DMALLOC_ARGS) #define tor_malloc_zero(size) _tor_malloc_zero(size DMALLOC_ARGS) +#define tor_calloc(nmemb,size) _tor_calloc(nmemb, size DMALLOC_ARGS) #define tor_malloc_roundup(szp) _tor_malloc_roundup(szp DMALLOC_ARGS) #define tor_realloc(ptr, size) _tor_realloc(ptr, size DMALLOC_ARGS) #define tor_strdup(s) _tor_strdup(s DMALLOC_ARGS) |