commit 94bff894f9e127888f15ec2333f86d0388e4da7d Author: Nick Mathewson <nickm@torproject.org> Date: Thu Jul 28 10:47:46 2016 -0400 Fix a large pile of solaris warnings for bug 19767. In nearly all cases, this is a matter of making sure that we include orconfig.h before we include any standard c headers. --- src/common/address.c | 1 + src/common/crypto.h | 2 ++ src/common/util.c | 4 ++-- src/ext/ed25519/donna/ed25519_tor.c | 2 +- src/ext/ed25519/ref10/keypair.c | 3 ++- src/ext/ed25519/ref10/open.c | 3 ++- src/or/circuitmux_ewma.c | 2 ++ src/test/test-child.c | 2 +- src/test/test-memwipe.c | 1 + src/test/test_channeltls.c | 2 ++ src/test/test_scheduler.c | 4 ++-- src/test/test_status.c | 2 ++ 12 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/common/address.c b/src/common/address.c index 793a40e..c514588 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -1595,6 +1595,7 @@ get_interface_addresses_raw,(int severity, sa_family_t family)) return result; #endif (void) severity; + (void) result; return NULL; } diff --git a/src/common/crypto.h b/src/common/crypto.h index 682c4e3..e4d3d06 100644 --- a/src/common/crypto.h +++ b/src/common/crypto.h @@ -13,6 +13,8 @@ #ifndef TOR_CRYPTO_H #define TOR_CRYPTO_H +#include "orconfig.h" + #include <stdio.h> #include "torint.h" #include "testsupport.h" diff --git a/src/common/util.c b/src/common/util.c index f3effe0..a100f37 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -4548,13 +4548,13 @@ tor_get_exit_code(process_handle_t *process_handle, return PROCESS_EXIT_RUNNING; } else if (retval != process_handle->pid) { log_warn(LD_GENERAL, "waitpid() failed for PID %d: %s", - process_handle->pid, strerror(errno)); + (int)process_handle->pid, strerror(errno)); return PROCESS_EXIT_ERROR; } if (!WIFEXITED(stat_loc)) { log_warn(LD_GENERAL, "Process %d did not exit normally", - process_handle->pid); + (int)process_handle->pid); return PROCESS_EXIT_ERROR; } diff --git a/src/ext/ed25519/donna/ed25519_tor.c b/src/ext/ed25519/donna/ed25519_tor.c index 52b259d..5f3fdc5 100644 --- a/src/ext/ed25519/donna/ed25519_tor.c +++ b/src/ext/ed25519/donna/ed25519_tor.c @@ -34,7 +34,7 @@ #define ED25519_FN2(fn,suffix) ED25519_FN3(fn,suffix) #define ED25519_FN(fn) ED25519_FN2(fn,ED25519_SUFFIX) - +#include "orconfig.h" #include "ed25519-donna.h" #include "ed25519_donna_tor.h" #include "ed25519-randombytes.h" diff --git a/src/ext/ed25519/ref10/keypair.c b/src/ext/ed25519/ref10/keypair.c index 7ddbaa9..68a88f9 100644 --- a/src/ext/ed25519/ref10/keypair.c +++ b/src/ext/ed25519/ref10/keypair.c @@ -1,6 +1,7 @@ /* Modified for Tor: new API, 64-byte secret keys. */ -#include <string.h> + #include "randombytes.h" +#include <string.h> #include "crypto_sign.h" #include "crypto_hash_sha512.h" #include "ge.h" diff --git a/src/ext/ed25519/ref10/open.c b/src/ext/ed25519/ref10/open.c index 9dbeb4c..3ab7b7d 100644 --- a/src/ext/ed25519/ref10/open.c +++ b/src/ext/ed25519/ref10/open.c @@ -1,6 +1,7 @@ /* (Modified by Tor to verify signature separately from message) */ -#include <string.h> + #include "crypto_sign.h" +#include <string.h> #include "crypto_hash_sha512.h" #include "crypto_verify_32.h" #include "ge.h" diff --git a/src/or/circuitmux_ewma.c b/src/or/circuitmux_ewma.c index b784a14..13836cd 100644 --- a/src/or/circuitmux_ewma.c +++ b/src/or/circuitmux_ewma.c @@ -8,6 +8,8 @@ #define TOR_CIRCUITMUX_EWMA_C_ +#include "orconfig.h" + #include <math.h> #include "or.h" diff --git a/src/test/test-child.c b/src/test/test-child.c index e2552a4..fdf3cce 100644 --- a/src/test/test-child.c +++ b/src/test/test-child.c @@ -1,8 +1,8 @@ /* Copyright (c) 2011-2016, The Tor Project, Inc. */ /* See LICENSE for licensing information */ -#include <stdio.h> #include "orconfig.h" +#include <stdio.h> #ifdef _WIN32 #define WINDOWS_LEAN_AND_MEAN #include <windows.h> diff --git a/src/test/test-memwipe.c b/src/test/test-memwipe.c index 5d4fcec..2689b95 100644 --- a/src/test/test-memwipe.c +++ b/src/test/test-memwipe.c @@ -1,3 +1,4 @@ +#include "orconfig.h" #include <string.h> #include <stdio.h> #include <sys/types.h> diff --git a/src/test/test_channeltls.c b/src/test/test_channeltls.c index 04ae9a6..fda466f 100644 --- a/src/test/test_channeltls.c +++ b/src/test/test_channeltls.c @@ -1,6 +1,8 @@ /* Copyright (c) 2014-2016, The Tor Project, Inc. */ /* See LICENSE for licensing information */ +#include "orconfig.h" + #include <math.h> #define TOR_CHANNEL_INTERNAL_ diff --git a/src/test/test_scheduler.c b/src/test/test_scheduler.c index 6e9889b..db331cb 100644 --- a/src/test/test_scheduler.c +++ b/src/test/test_scheduler.c @@ -1,10 +1,10 @@ /* Copyright (c) 2014-2016, The Tor Project, Inc. */ /* See LICENSE for licensing information */ -#include <math.h> - #include "orconfig.h" +#include <math.h> + /* Libevent stuff */ #ifdef HAVE_EVENT2_EVENT_H #include <event2/event.h> diff --git a/src/test/test_status.c b/src/test/test_status.c index 84a0f6c..1f4ec0a 100644 --- a/src/test/test_status.c +++ b/src/test/test_status.c @@ -3,6 +3,8 @@ #define LOG_PRIVATE #define REPHIST_PRIVATE +#include "orconfig.h" + #include <float.h> #include <math.h>