Remove all use of the assert.h header

Nothing in Tor has actually called assert() for some while.

diff --git a/configure.ac b/configure.ac
index d46bcf8a944c37da95c3ca18eb6df7072c3e413e..f94258fbb71b5edc116c29ee728b263edb686e67 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1312,8 +1312,7 @@ AC_SUBST(CURVE25519_LIBS)
 dnl Make sure to enable support for large off_t if available.
 AC_SYS_LARGEFILE
 
-AC_CHECK_HEADERS([assert.h \
-                  errno.h \
+AC_CHECK_HEADERS([errno.h \
                   fcntl.h \
                   signal.h \
                   string.h \

diff --git a/src/common/address.c b/src/common/address.c
index 2e8b5fc9f5e82cae0dfaa243376a33166433d007..f135f1ffd194e90e8a1562be73687045623dd023 100644 (file)
--- a/src/common/address.c
+++ b/src/common/address.c
@@ -83,7 +83,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <assert.h>
 
 /* tor_addr_is_null() and maybe other functions rely on AF_UNSPEC being 0 to
  * work correctly. Bail out here if we've found a platform where AF_UNSPEC

diff --git a/src/common/aes.c b/src/common/aes.c
index c0851c542126a2cdfe78ee9b76873421b528a7c8..bdefc2b55557d2efc3801672ccce132f6ee83fcf 100644 (file)
--- a/src/common/aes.c
+++ b/src/common/aes.c
@@ -26,7 +26,6 @@
 
 DISABLE_GCC_WARNING(redundant-decls)
 
-#include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 #include <openssl/aes.h>

diff --git a/src/common/compat.c b/src/common/compat.c
index 9b1a4d860f40b999095e4ad31b4c0bc2a9c82b35..dece798bcd646920bc649b1e9e8aa1ef523b34ab 100644 (file)
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -111,7 +111,6 @@ SecureZeroMemory(PVOID ptr, SIZE_T cnt)
 #endif
 #include <stdio.h>
 #include <stdlib.h>
-#include <assert.h>
 #ifdef HAVE_SIGNAL_H
 #include <signal.h>
 #endif

diff --git a/src/common/compress.c b/src/common/compress.c
index 204529a54dfad93443ce287469b9aa4d3c8a323a..44bb891af437163d88f244d75844813051c3211f 100644 (file)
--- a/src/common/compress.c
+++ b/src/common/compress.c
@@ -12,7 +12,6 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include <assert.h>
 #include <string.h>
 #include "common/torint.h"
 

diff --git a/src/common/container.c b/src/common/container.c
index 03324c8730eaf3af16947aaafec11721dca609c8..b1a2ac79940817119fa148409454310e6cccdf28 100644 (file)
--- a/src/common/container.c
+++ b/src/common/container.c
@@ -19,7 +19,6 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <assert.h>
 
 #include "ht.h"
 

diff --git a/src/common/log.c b/src/common/log.c
index 2f5fdbc17d01031bbeeb9e7891186725b30efb20..6aa2203a59d6222383ca17ced401382bff80dccf 100644 (file)
--- a/src/common/log.c
+++ b/src/common/log.c
@@ -11,7 +11,6 @@
 
 #include "orconfig.h"
 #include <stdarg.h>
-#include <assert.h>
 // #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/src/common/tortls.c b/src/common/tortls.c
index b22a5aa7c90b9231ca3bbf39811675006ce87bdf..419d9c9316902feee4d37ca2fe635a6a002a1b65 100644 (file)
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -19,7 +19,6 @@
 #define TORTLS_PRIVATE
 #define TORTLS_OPENSSL_PRIVATE
 
-#include <assert.h>
 #ifdef _WIN32 /*wrkard for dtls1.h >= 0.9.8m of "#include <winsock.h>"*/
   #include <winsock2.h>
   #include <ws2tcpip.h>

diff --git a/src/common/util.c b/src/common/util.c
index 5bf70c6b5dc0f77314c6915b42c3f7e47ebb73ea..7d10a9e246639e626057871929d9d99e4eacc2c9 100644 (file)
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -45,7 +45,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <assert.h>
 #include <signal.h>
 
 #ifdef HAVE_NETINET_IN_H

diff --git a/src/or/or.h b/src/or/or.h
index dc6d353cd9297c824adffb23695813b08dc071b9..33a674d14646e79d30d2a8ad561fd9531edeb1d3 100644 (file)
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -51,9 +51,6 @@
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
 #endif
-#ifdef HAVE_ASSERT_H
-#include <assert.h>
-#endif
 #ifdef HAVE_TIME_H
 #include <time.h>
 #endif
@@ -3331,4 +3328,3 @@ typedef enum was_router_added_t {
 typedef struct tor_version_t tor_version_t;
 
 #endif /* !defined(TOR_OR_H) */
-

diff --git a/src/tools/tor-gencert.c b/src/tools/tor-gencert.c
index e1d3e54d8eb0c353b19722b86b2e86807844d79e..07db3624ba9f41dc4b97e198b7c45454ec2e728b 100644 (file)
--- a/src/tools/tor-gencert.c
+++ b/src/tools/tor-gencert.c
@@ -33,7 +33,6 @@ ENABLE_GCC_WARNING(redundant-decls)
 #if 0
 #include <stdlib.h>
 #include <stdarg.h>
-#include <assert.h>
 #endif
 
 #include "common/util.h"

diff --git a/src/tools/tor-resolve.c b/src/tools/tor-resolve.c
index dfca7d7925c65130bb1f800bacbce8fbebcf5ebb..85ff14167180c282b27212d696d1d5eb7e5c4a57 100644 (file)
--- a/src/tools/tor-resolve.c
+++ b/src/tools/tor-resolve.c
@@ -14,7 +14,6 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
-#include <assert.h>
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>