aboutsummaryrefslogtreecommitdiff
path: root/src/common/util.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-05-27 11:26:14 -0400
committerNick Mathewson <nickm@torproject.org>2016-05-27 11:26:14 -0400
commitce1dbbc4fdd7ab6fab4f31a0e54d9ca97afe74a9 (patch)
tree354dedd9d603f203aa65b1755138cf939e8216b6 /src/common/util.c
parent0df2c5677a79aafc32591b15ca07d25c638b68cc (diff)
downloadtor-ce1dbbc4fdd7ab6fab4f31a0e54d9ca97afe74a9.tar.gz
tor-ce1dbbc4fdd7ab6fab4f31a0e54d9ca97afe74a9.zip
Enable the -Waggregate-return warning
Suppress it in the one spot in the code where we actually do want to allow an aggregate return in order to call the mallinfo() API.
Diffstat (limited to 'src/common/util.c')
-rw-r--r--src/common/util.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/common/util.c b/src/common/util.c
index 78afe5954f..925431d181 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -342,6 +342,7 @@ tor_free_(void *mem)
tor_free(mem);
}
+DISABLE_GCC_WARNING(aggregate-return)
/** Call the platform malloc info function, and dump the results to the log at
* level <b>severity</b>. If no such function exists, do nothing. */
void
@@ -369,6 +370,7 @@ tor_log_mallinfo(int severity)
);
#endif
}
+ENABLE_GCC_WARNING(aggregate-return)
/* =====
* Math