diff options
| author | Nick Mathewson <nickm@torproject.org> | 2008-01-06 03:16:08 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2008-01-06 03:16:08 +0000 |
| commit | 6d58d80e78d9b6706bda502a9041351f4a619306 (patch) | |
| tree | f5b0a15ed1e1f212de955e360b06661e47ac0c50 /src/common/util.c | |
| parent | 864d83059823bbd89c94dcff258f99977b17bcd6 (diff) | |
| download | tor-6d58d80e78d9b6706bda502a9041351f4a619306.tar.gz tor-6d58d80e78d9b6706bda502a9041351f4a619306.zip | |
r17472@catbus: nickm | 2008-01-05 22:10:19 -0500
Another test for the increasingly bad check-spaces style checker to check: #else\n#if is almost a sure sign of a failure to use #elif. Fortunately, we only did that 3 times.
svn:r13039
Diffstat (limited to 'src/common/util.c')
| -rw-r--r-- | src/common/util.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/common/util.c b/src/common/util.c index aaf057cd1c..357f997f10 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -233,15 +233,13 @@ _tor_malloc_roundup(size_t *sizep DMALLOC_PARAMS) #ifdef HAVE_MALLOC_GOOD_SIZE *sizep = malloc_good_size(*sizep); return _tor_malloc(*sizep DMALLOC_FN_ARGS); -#else -#if defined(HAVE_MALLOC_USABLE_SIZE) && !defined(USE_DMALLOC) +#elif defined(HAVE_MALLOC_USABLE_SIZE) && !defined(USE_DMALLOC) void *result = _tor_malloc(*sizep DMALLOC_FN_ARGS); *sizep = malloc_usable_size(result); return result; #else return _tor_malloc(*sizep DMALLOC_FN_ARGS); #endif -#endif } /** Call the platform malloc info function, and dump the results to the log at |