Selaa lähdekoodia

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.
Nick Mathewson 10 vuotta sitten
vanhempi
commit
ce1dbbc4fd
2 muutettua tiedostoa jossa 3 lisäystä ja 2 poistoa
  1. 1 2
      configure.ac
  2. 2 0
      src/common/util.c

+ 1 - 2
configure.ac

@@ -1698,8 +1698,7 @@ if test "x$enable_gcc_warnings_advisory" != "xno"; then
   CFLAGS="$CFLAGS -Wredundant-decls -Wchar-subscripts -Wcomment -Wformat=2"
   CFLAGS="$CFLAGS -Wwrite-strings -Wmissing-declarations -Wredundant-decls"
   CFLAGS="$CFLAGS -Wnested-externs -Wbad-function-cast -Wswitch-enum"
-
-  # Disabled, so we can use mallinfo(): -Waggregate-return
+  CFLAGS="$CFLAGS -Waggregate-return"
 
   if test "x$have_gcc4" = "xyes"; then
     # These warnings break gcc 3.3.5 and work on gcc 4.0.2

+ 2 - 0
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