[tor-commits] [tor/master] Stop using util.h and compat.h in src/tools

[nickm@xxxxxxxxxxxxxx]

commit 666e3e5ec681971b8cbf49294426208d9e83f3bd
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Jun 29 11:41:38 2018 -0400

    Stop using util.h and compat.h in src/tools
---
 src/tools/tor-gencert.c | 17 +++++++++--------
 src/tools/tor-resolve.c | 11 ++++++++---
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/tools/tor-gencert.c b/src/tools/tor-gencert.c
index dd2a3ea63..ce032ed64 100644
--- a/src/tools/tor-gencert.c
+++ b/src/tools/tor-gencert.c
@@ -13,7 +13,7 @@
 #include <unistd.h>
 #endif
 
-#include "common/compat.h"
+#include "lib/cc/compat_compiler.h"
 
 /* Some versions of OpenSSL declare X509_STORE_CTX_set_verify_cb twice in
  * x509.h and x509_vfy.h. Suppress the GCC warning so we can build with
@@ -30,19 +30,20 @@ DISABLE_GCC_WARNING(redundant-decls)
 ENABLE_GCC_WARNING(redundant-decls)
 
 #include <errno.h>
-#if 0
-#include <stdlib.h>
-#include <stdarg.h>
-#endif
 
-#include "common/util.h"
-#include "lib/log/torlog.h"
 #include "lib/crypt_ops/crypto.h"
 #include "lib/crypt_ops/crypto_digest.h"
 #include "lib/crypt_ops/crypto_rand.h"
 #include "lib/crypt_ops/crypto_util.h"
-#include "lib/net/address.h"
 #include "lib/encoding/binascii.h"
+#include "lib/encoding/time_fmt.h"
+#include "lib/fs/files.h"
+#include "lib/log/torlog.h"
+#include "lib/malloc/util_malloc.h"
+#include "lib/net/address.h"
+#include "lib/net/ipv4.h"
+#include "lib/string/compat_string.h"
+#include "lib/string/printf.h"
 
 #define IDENTITY_KEY_BITS 3072
 #define SIGNING_KEY_BITS 2048
diff --git a/src/tools/tor-resolve.c b/src/tools/tor-resolve.c
index 408803462..303c7af3e 100644
--- a/src/tools/tor-resolve.c
+++ b/src/tools/tor-resolve.c
@@ -4,11 +4,16 @@
 /* See LICENSE for licensing information */
 
 #include "orconfig.h"
-#include "common/compat.h"
-#include "common/util.h"
-#include "lib/net/address.h"
+
+#include "lib/arch/bytes.h"
 #include "lib/log/torlog.h"
+#include "lib/malloc/util_malloc.h"
+#include "lib/net/address.h"
+#include "lib/net/resolve.h"
+#include "lib/net/socket.h"
 #include "lib/sandbox/sandbox.h"
+#include "lib/string/util_string.h"
+
 #include "common/socks5_status.h"
 
 #include <stdio.h>



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits