Browse Source

Remove all use of the assert.h header

Nothing in Tor has actually called assert() for some while.
Nick Mathewson 5 years ago
parent
commit
90aeaa53cd

+ 1 - 2
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 \

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

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

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

+ 0 - 1
src/common/compress.c

@@ -12,7 +12,6 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include <assert.h>
 #include <string.h>
 #include "common/torint.h"
 

+ 0 - 1
src/common/container.c

@@ -19,7 +19,6 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <assert.h>
 
 #include "ht.h"
 

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

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

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

+ 0 - 4
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) */
-

+ 0 - 1
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"

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