Author: Kev <klmitch@mit.edu>

Log message:

Implement a custom assert() macro (in ircd_log.h).  This variant of
assert() is similar to the system assert(), in that it ends with a call to
abort() if the assertion fails; however, logging is done through the
logging subsystem.  (A sentinel is added to (hopefully) prevent an
assertion failure somewhere in the logging subsystem from entering into an
infinite loop; if this happens, there will be no output at all, but abort()
will still be called.)

git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@1271 c9e4aea6-c8fd-4c43-8297-357d70d61c8c

diff --git a/ChangeLog b/ChangeLog
index 1b391a30eea1ffa36da924139418a6226877550e..0a26e290ac74502e791f857020d21b8bcba2de8d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2004-12-11  Kevin L Mitchell  <klmitch@mit.edu>
+
+       * ircd/*.c: use new assert() in ircd_log.h in preference to system
+       assert()
+
+       * ircd/umkpasswd.c: use new assert in ircd_log.h; add necessary
+       glue so that umkpasswd will successfully compile and link
+
+       * ircd/test/ircd_chattr_t.c: comment out include of assert.h since
+       there are no calls to assert()
+
+       * ircd/ircd_log.c: add sentinel (log_inassert) to prevent assert()
+       from looping should there be an assertion failure somewhere in the
+       logging subsystem
+
+       * include/ircd_log.h: custom implementation of assert() that calls
+       log_write()
+
 2004-11-21  Michael Poole <mdpoole@troilus.org>
 
        * ircd/channel.c (mode_parse_upass): Allow forced mode changes to

diff --git a/include/ircd_log.h b/include/ircd_log.h
index 20f0a25dcecde0d5fc25c4b348472a77f83cd8bd..956908cb6af8b2eb44e736a0f29a3c9633d39144 100644 (file)
--- a/include/ircd_log.h
+++ b/include/ircd_log.h
@@ -26,6 +26,10 @@
 #include <stdarg.h>        /* va_list */
 #define INCLUDED_stdarg_h
 #endif
+#ifndef INCLUDED_stdlib_h
+#include <stdlib.h> /* abort */
+#define INCLUDED_stdlib_h
+#endif
 
 struct Client;
 
@@ -107,4 +111,47 @@ extern void log_feature_unmark(void);
 extern int log_feature_mark(int flag);
 extern void log_feature_report(struct Client *to, int flag);
 
+extern int log_inassert;
+
 #endif /* INCLUDED_ircd_log_h */
+
+/* The rest of this file implements our own custom version of assert.
+ * This version will log the assertion failure using the LS_SYSTEM log
+ * stream, thus putting the assertion failure message into a useful
+ * place, rather than elsewhere, as is currently the case...
+ */
+
+/* We've been included twice; clean up before creating assert() again */
+#ifdef _ircd_log_assert
+# undef _ircd_log_assert
+# undef assert
+#endif
+
+/* gcc has a nice way of hinting that an expression is expected to
+ * produce a specific result, which can improve optimization.
+ * Unfortunately, all the world's not gcc (at least, not yet), and not
+ * all gcc's support it.  I don't know exactly when it appeared, but
+ * it does appear to be in all versions from 3 and up.  So, we'll
+ * create a dummy define if (we think) this version of gcc doesn't
+ * have it...
+ */
+#ifndef _log_builtin_expect
+# define _log_builtin_expect
+# if __GNUC__ < 3
+#  define __builtin_expect(expr, expect)       (expr)
+# endif
+#endif
+
+/* let's try not to clash with the system assert()... */
+#ifndef assert
+# ifdef NDEBUG
+#  define assert(expr) ((void)0)
+# else
+#  define assert(expr)                                                       \
+  ((void)(__builtin_expect(!!(expr), 1) ? 0 :                                \
+         (__builtin_expect(log_inassert, 0) ? (abort(), 0) :                 \
+          ((log_inassert = 1), /* inhibit looping in assert() */             \
+           log_write(LS_SYSTEM, L_CRIT, 0, "Assertion failure at %s:%d: "    \
+                     "\"%s\"", __FILE__, __LINE__, #expr), abort(), 0))))
+# endif
+#endif

diff --git a/ircd/IPcheck.c b/ircd/IPcheck.c
index d3367539d35b8350cee71e63582cb9426c0f45ce..49a448aca3819171090adc9a0a61bad9a7537deb 100644 (file)
--- a/ircd/IPcheck.c
+++ b/ircd/IPcheck.c
@@ -31,11 +31,12 @@
 #include "ircd_alloc.h"
 #include "ircd_events.h"
 #include "ircd_features.h"
+#include "ircd_log.h"
 #include "s_debug.h"        /* Debug */
 #include "s_user.h"         /* TARGET_DELAY */
 #include "send.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <string.h>
 
 /** Stores free target information for a particular user. */

diff --git a/ircd/channel.c b/ircd/channel.c
index 90eed24df70e11ae167d2fdb71658ce6faab6e9f..4ff88acaa1b759a8d96098d44390b685982c01a2 100644 (file)
--- a/ircd/channel.c
+++ b/ircd/channel.c
@@ -53,7 +53,7 @@
 #include "sys.h"
 #include "whowas.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/ircd/class.c b/ircd/class.c
index 53fd65edd1cb00a713add3bc7a43a2894b3134e5..e0fe644639f230165f2b96b3babee6b54c0575d5 100644 (file)
--- a/ircd/class.c
+++ b/ircd/class.c
@@ -27,6 +27,7 @@
 #include "ircd.h"
 #include "ircd_alloc.h"
 #include "ircd_features.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "list.h"
@@ -35,7 +36,7 @@
 #include "s_debug.h"
 #include "send.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 
 /** List of all connection classes. */
 static struct ConnectionClass* connClassList;

diff --git a/ircd/client.c b/ircd/client.c
index 8568345c3d511d3bb0fe810c68e10e5683c68381..6860d0cb759ff0ac76db84748f9a8476b90721b6 100644 (file)
--- a/ircd/client.c
+++ b/ircd/client.c
@@ -26,6 +26,7 @@
 #include "class.h"
 #include "ircd.h"
 #include "ircd_features.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "list.h"
 #include "msgq.h"
@@ -35,7 +36,7 @@
 #include "send.h"
 #include "struct.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <string.h>
 
 /** Find the shortest non-zero ping time attached to a client.

diff --git a/ircd/dbuf.c b/ircd/dbuf.c
index 13933f1cb8aa8dc7fb3c3d237eb3660d32b5a84c..a7abe5b1a6d85b36c43c778db5cfc51e56b00408 100644 (file)
--- a/ircd/dbuf.c
+++ b/ircd/dbuf.c
@@ -26,10 +26,11 @@
 #include "ircd_alloc.h"
 #include "ircd_chattr.h"
 #include "ircd_features.h"
+#include "ircd_log.h"
 #include "send.h"
 #include "sys.h"       /* MIN */
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <string.h>
 
 /*

diff --git a/ircd/destruct_event.c b/ircd/destruct_event.c
index 32bb3fb9d7f3e1d382aafa9425600d9c0bdfb5d2..b16fd98319a5b1e33643137440cf34a055f8090e 100644 (file)
--- a/ircd/destruct_event.c
+++ b/ircd/destruct_event.c
@@ -27,10 +27,11 @@
 #include "ircd_alloc.h"
 #include "ircd.h"
 #include "ircd_events.h"
+#include "ircd_log.h"
 #include "send.h"
 #include "msg.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <stdlib.h>
 
 /** Structure describing a destruction event. */

diff --git a/ircd/engine_devpoll.c b/ircd/engine_devpoll.c
index 9c4d49c2350a5e498eef26953859cd8aad2e9ff1..daceb69617e4af9974253a888e81d36f9305a36c 100644 (file)
--- a/ircd/engine_devpoll.c
+++ b/ircd/engine_devpoll.c
@@ -30,7 +30,7 @@
 #include "ircd_log.h"
 #include "s_debug.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/devpoll.h>

diff --git a/ircd/engine_epoll.c b/ircd/engine_epoll.c
index c44e135da44d01bdd4f9760da23db177bbb29d2e..4a929abbe0e935e2a5231ea46880e3d2e45a068b 100644 (file)
--- a/ircd/engine_epoll.c
+++ b/ircd/engine_epoll.c
@@ -29,7 +29,7 @@
 #include "ircd_log.h"
 #include "s_debug.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <errno.h>
 #include <sys/types.h>
 #ifdef HAVE_STDINT_H

diff --git a/ircd/engine_kqueue.c b/ircd/engine_kqueue.c
index 914a09cedf7f6b75e19d7a59ceba04c82af4c28f..4e419f88f0f069f0d92c84becc4561b6cde44310 100644 (file)
--- a/ircd/engine_kqueue.c
+++ b/ircd/engine_kqueue.c
@@ -30,7 +30,7 @@
 #include "ircd_log.h"
 #include "s_debug.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <errno.h>
 #include <signal.h>
 #include <sys/event.h>

diff --git a/ircd/engine_poll.c b/ircd/engine_poll.c
index 58b3f9e21e34db2fa75ad64abd40843371aff392..e0c4bf4c3aac29cdd3ab0b6d6f9ae0e960bb78a6 100644 (file)
--- a/ircd/engine_poll.c
+++ b/ircd/engine_poll.c
@@ -29,7 +29,7 @@
 #include "ircd_log.h"
 #include "s_debug.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <errno.h>
 #include <sys/poll.h>
 #include <sys/socket.h>

diff --git a/ircd/engine_select.c b/ircd/engine_select.c
index e759967bc2516cac472ceb57848f9a67e6e5ba83..205283c052880437be380ec9f62d4d182d8a19e5 100644 (file)
--- a/ircd/engine_select.c
+++ b/ircd/engine_select.c
@@ -35,7 +35,7 @@
 # endif
 #endif
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <errno.h>
 #include <string.h> /* needed for bzero() on OS X */
 #include <sys/socket.h>

diff --git a/ircd/fileio.c b/ircd/fileio.c
index 38667868279b4837445f488bea02b211efa311db..2684a3808d037376fb14f59237de708ab397eabc 100644 (file)
--- a/ircd/fileio.c
+++ b/ircd/fileio.c
@@ -26,8 +26,9 @@
 
 #include "fileio.h"
 #include "ircd_alloc.h"         /* MyMalloc, MyFree */
+#include "ircd_log.h"           /* assert */
 
-#include <assert.h>             /* assert */
+/* #include <assert.h> -- Now using assert in ircd_log.h */       /* assert */
 #include <fcntl.h>              /* O_RDONLY, O_WRONLY, ... */
 #include <stdio.h>              /* BUFSIZ, EOF */
 #include <sys/stat.h>           /* struct stat */

diff --git a/ircd/gline.c b/ircd/gline.c
index e0a7278f17c01e50c7f26dbfd2d30cd3db3090e9..68b7a9e83b59bb1efbedc118f9b763161de64fd9 100644 (file)
--- a/ircd/gline.c
+++ b/ircd/gline.c
@@ -46,7 +46,7 @@
 #include "sys.h"    /* FALSE bleah */
 #include "whocmds.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/ircd/hash.c b/ircd/hash.c
index aaf017bba75e9cbe4e2c12cc6cdb91fa6322d839..ff777ae58f972c1af2702934bab492bd5b6b874f 100644 (file)
--- a/ircd/hash.c
+++ b/ircd/hash.c
@@ -26,6 +26,7 @@
 #include "channel.h"
 #include "ircd_alloc.h"
 #include "ircd_chattr.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "ircd.h"
@@ -36,7 +37,7 @@
 #include "struct.h"
 #include "sys.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/ircd/ircd.c b/ircd/ircd.c
index 686e874618e8dd5dcd0c06af8b041329dba371c8..175f1e8e50c06d06ce26863f3182a76c33ecb257 100644 (file)
--- a/ircd/ircd.c
+++ b/ircd/ircd.c
@@ -61,7 +61,7 @@
 #include "version.h"
 #include "whowas.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <errno.h>
 #include <fcntl.h>
 #include <netdb.h>

diff --git a/ircd/ircd_alloc.c b/ircd/ircd_alloc.c
index 62944c5abfb09ac0802596096848387ecd80613f..5dd4ef7fccd183f91e4594a223ea1d703643b843 100644 (file)
--- a/ircd/ircd_alloc.c
+++ b/ircd/ircd_alloc.c
@@ -26,10 +26,11 @@
 #include "config.h"
 
 #include "ircd_alloc.h"
+#include "ircd_log.h"
 #include "ircd_string.h"
 #include "s_debug.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <string.h>
 
 static void nomem_handler(void);

diff --git a/ircd/ircd_auth.c b/ircd/ircd_auth.c
index b6fc1edbc7fc9c086dde09f28d82d09f507bbf49..03c59b804f8095a8ef40b8dd027410d809b95969 100644 (file)
--- a/ircd/ircd_auth.c
+++ b/ircd/ircd_auth.c
@@ -42,7 +42,7 @@
 #include "s_user.h"
 #include "send.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <errno.h>
 #include <netdb.h>
 #include <string.h>

diff --git a/ircd/ircd_crypt.c b/ircd/ircd_crypt.c
index c96c564538da52cee6bf2f22a9bf469bdb44b072..8036ac0fb3e66ae4ba499022bcdd6e8f17fa04fd 100644 (file)
--- a/ircd/ircd_crypt.c
+++ b/ircd/ircd_crypt.c
@@ -47,6 +47,7 @@
 #include "ircd_crypt.h"
 #include "ircd_alloc.h"
 #include "ircd_features.h"
+#include "ircd_log.h"
 #include "ircd_string.h"
 #include "s_debug.h"
 
@@ -55,7 +56,7 @@
 #include "ircd_crypt_plain.h"
 #include "ircd_crypt_smd5.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <unistd.h>
 #include <string.h>
 

diff --git a/ircd/ircd_crypt_native.c b/ircd/ircd_crypt_native.c
index e3a8fbe31297e83a50079c455c542f3e424f2782..25d2b4e0d87023334872397983c3db88e0167377 100644 (file)
--- a/ircd/ircd_crypt_native.c
+++ b/ircd/ircd_crypt_native.c
@@ -31,10 +31,11 @@
 #include "config.h"
 #include "ircd_crypt.h"
 #include "ircd_crypt_native.h"
+#include "ircd_log.h"
 #include "s_debug.h"
 #include "ircd_alloc.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <unistd.h>
 #ifdef HAVE_CRYPT_H
 #include <crypt.h>

diff --git a/ircd/ircd_crypt_plain.c b/ircd/ircd_crypt_plain.c
index 03cb3e1d4868b215f66b2cd88e8a06350b270844..2b96a735b32900420b609cf53ec00f5751ae8744 100644 (file)
--- a/ircd/ircd_crypt_plain.c
+++ b/ircd/ircd_crypt_plain.c
@@ -27,10 +27,11 @@
 #include "config.h"
 #include "ircd_crypt.h"
 #include "ircd_crypt_plain.h"
+#include "ircd_log.h"
 #include "s_debug.h"
 #include "ircd_alloc.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <unistd.h>
 
 /** Just sends back the supplied password.

diff --git a/ircd/ircd_crypt_smd5.c b/ircd/ircd_crypt_smd5.c
index af583ff89c55fc5018be370d508309a75358afb3..6ef7f4f243788f0c669779585b91d46c13464beb 100644 (file)
--- a/ircd/ircd_crypt_smd5.c
+++ b/ircd/ircd_crypt_smd5.c
@@ -39,11 +39,12 @@
 #include "config.h"
 #include "ircd_crypt.h"
 #include "ircd_crypt_smd5.h"
+#include "ircd_log.h"
 #include "ircd_md5.h"
 #include "s_debug.h"
 #include "ircd_alloc.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <string.h>
 #include <unistd.h>
 

diff --git a/ircd/ircd_events.c b/ircd/ircd_events.c
index ac61fd3c5720493d18344c67f289fe4174515d0d..29b81a59f15811ece74b4410f50e6b1cfd5b7a70 100644 (file)
--- a/ircd/ircd_events.c
+++ b/ircd/ircd_events.c
@@ -30,7 +30,7 @@
 #include "ircd_snprintf.h"
 #include "s_debug.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <signal.h>
 #include <stdlib.h>
 #include <unistd.h>

diff --git a/ircd/ircd_features.c b/ircd/ircd_features.c
index 9c2ad488d1bb009df25ee0fd72f815de39233bcd..a7dac3510da2b9c869f65adbaf2fbfc83733765c 100644 (file)
--- a/ircd/ircd_features.c
+++ b/ircd/ircd_features.c
@@ -46,7 +46,7 @@
 #include "sys.h"    /* FALSE bleah */
 #include "whowas.h"    /* whowas_realloc */
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/ircd/ircd_log.c b/ircd/ircd_log.c
index aa819b880048ec179187a205fa136d6ace74a285..66b3318b1941cf47f2a76d5df928490ba57308dc 100644 (file)
--- a/ircd/ircd_log.c
+++ b/ircd/ircd_log.c
@@ -38,7 +38,7 @@
 #include "send.h"
 #include "struct.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <errno.h>
 #include <fcntl.h>
 #include <stdarg.h>
@@ -52,6 +52,8 @@
 #include <time.h>
 #include <unistd.h>
 
+int log_inassert = 0;
+
 #define LOG_BUFSIZE 2048 /**< Maximum length for a log message. */
 
 /** Select default log level cutoff. */

diff --git a/ircd/ircd_relay.c b/ircd/ircd_relay.c
index 5061a4bfefe7e6b31422acf973eca2333edaa59c..0cb7e80dded0bb8029717f275e92449520f30250 100644 (file)
--- a/ircd/ircd_relay.c
+++ b/ircd/ircd_relay.c
@@ -52,6 +52,7 @@
 #include "ircd.h"
 #include "ircd_chattr.h"
 #include "ircd_features.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "match.h"
@@ -63,7 +64,7 @@
 #include "s_user.h"
 #include "send.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/ircd/ircd_reply.c b/ircd/ircd_reply.c
index 440d84ab4b95856de36dd31dc9d2b12d79b34d84..d5641bec321049be60129b47ca01d7fc61d69dd1 100644 (file)
--- a/ircd/ircd_reply.c
+++ b/ircd/ircd_reply.c
@@ -29,6 +29,7 @@
 #include "ircd_reply.h"
 #include "client.h"
 #include "ircd.h"
+#include "ircd_log.h"
 #include "ircd_snprintf.h"
 #include "msg.h"
 #include "msgq.h"
@@ -37,7 +38,7 @@
 #include "s_debug.h"
 #include "send.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <string.h>
 
 /** Report a protocol violation warning to anyone listening.  This can

diff --git a/ircd/ircd_res.c b/ircd/ircd_res.c
index 0fd56b7c70d4e6a98fb796889720941e820f8106..5ca6feabc5efefd423976ef1bd1252d15d21ddd2 100644 (file)
--- a/ircd/ircd_res.c
+++ b/ircd/ircd_res.c
@@ -40,7 +40,7 @@
 #include "res.h"
 #include "ircd_reslib.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <string.h>
 #include <sys/time.h>
 #include <sys/socket.h>

diff --git a/ircd/ircd_signal.c b/ircd/ircd_signal.c
index afe0b96c4c8b993048c0f704ffcfe62422a47138..9c868b2ff239c0beef3b1029574dfcf454bad02f 100644 (file)
--- a/ircd/ircd_signal.c
+++ b/ircd/ircd_signal.c
@@ -25,10 +25,11 @@
 
 #include "ircd.h"
 #include "ircd_events.h"
+#include "ircd_log.h"
 #include "ircd_signal.h"
 #include "s_conf.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <signal.h>
 
 /** Counts various types of signals that we receive. */

diff --git a/ircd/ircd_snprintf.c b/ircd/ircd_snprintf.c
index 3c7cfb02f58792883a18b9d41c566428b2308442..42f0e1054900a164016e72344406e6bacf1a4b97 100644 (file)
--- a/ircd/ircd_snprintf.c
+++ b/ircd/ircd_snprintf.c
@@ -24,10 +24,11 @@
 
 #include "client.h"
 #include "channel.h"
+#include "ircd_log.h"
 #include "ircd_snprintf.h"
 #include "struct.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <errno.h>
 #include <stddef.h>
 #include <stdlib.h>

diff --git a/ircd/ircd_string.c b/ircd/ircd_string.c
index 37e4b6cf92f38ac4e751c917e64b73d7ea97ab83..4f90c9f3928b29b14647f14bececf146eb6f85d1 100644 (file)
--- a/ircd/ircd_string.c
+++ b/ircd/ircd_string.c
@@ -28,7 +28,7 @@
 #include "ircd_log.h"
 #include "res.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <string.h>
 #include <regex.h>
 #include <sys/types.h>

diff --git a/ircd/jupe.c b/ircd/jupe.c
index 3d69a74f8cfe74359caeca836c69641a5088e2db..8cdaa9edad061875052ea4e3e0bacee0c95321c3 100644 (file)
--- a/ircd/jupe.c
+++ b/ircd/jupe.c
@@ -43,7 +43,7 @@
 #include "struct.h"
 #include "sys.h"    /* FALSE bleah */
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <string.h>
 
 /** List of jupes. */

diff --git a/ircd/list.c b/ircd/list.c
index 2bb9cd8b7e44296bece8d3ed4ca4b0e04a85e175..b01305852b5f0f0dc8d4a312b85ff69baf350828 100644 (file)
--- a/ircd/list.c
+++ b/ircd/list.c
@@ -28,6 +28,7 @@
 #include "ircd.h"
 #include "ircd_alloc.h"
 #include "ircd_events.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "listener.h"
@@ -44,7 +45,7 @@
 #include "struct.h"
 #include "whowas.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <stddef.h>  /* offsetof */
 #include <unistd.h>  /* close */
 #include <string.h>

diff --git a/ircd/listener.c b/ircd/listener.c
index b94957986a525b85643926f7437074ec00171c58..76638205f3289f759fb32a5e101541b6c6fd5793 100644 (file)
--- a/ircd/listener.c
+++ b/ircd/listener.c
@@ -28,6 +28,7 @@
 #include "ircd_alloc.h"
 #include "ircd_events.h"
 #include "ircd_features.h"
+#include "ircd_log.h"
 #include "ircd_osdep.h"
 #include "ircd_reply.h"
 #include "ircd_snprintf.h"
@@ -41,7 +42,7 @@
 #include "send.h"
 #include "sys.h"         /* MAXCLIENTS */
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>

diff --git a/ircd/m_account.c b/ircd/m_account.c
index 3b00133aef6eae64adca85be42f12e43de44ecf9..5040a528333ee6c090b5d319ec641653bc79b9c3 100644 (file)
--- a/ircd/m_account.c
+++ b/ircd/m_account.c
@@ -82,6 +82,7 @@
 
 #include "client.h"
 #include "ircd.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "msg.h"
@@ -90,7 +91,7 @@
 #include "s_user.h"
 #include "send.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/ircd/m_admin.c b/ircd/m_admin.c
index dd8d0f4b4a3674759feb871e9736d4555df99c57..bfaa78c46e5b5c14bf172c50694d3aca2bd57509 100644 (file)
--- a/ircd/m_admin.c
+++ b/ircd/m_admin.c
@@ -85,6 +85,7 @@
 #include "hash.h"
 #include "ircd.h"
 #include "ircd_features.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "msg.h"
 #include "numeric.h"
@@ -92,7 +93,7 @@
 #include "s_conf.h"
 #include "s_user.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 
 static int send_admin_info(struct Client* sptr)
 {

diff --git a/ircd/m_asll.c b/ircd/m_asll.c
index 5da2c87cbba9b0cac49c7eb0fb5ebc7ba6eaf997..cfe1e412d003a6b0e61fbddcf223350fbe6b2e37 100644 (file)
--- a/ircd/m_asll.c
+++ b/ircd/m_asll.c
@@ -83,6 +83,7 @@
 #include "client.h"
 #include "hash.h"
 #include "ircd.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "numeric.h"
@@ -93,7 +94,7 @@
 #include "s_bsd.h"
 #include "s_user.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <stdlib.h>
 
 static int send_asll_reply(struct Client *from, struct Client *to, char *server,

diff --git a/ircd/m_away.c b/ircd/m_away.c
index 00fc7ab5d5627db273bf7a9217dbff3756a098e5..ef440c19ab37a54009864dd76bdbbcf0cc5c897c 100644 (file)
--- a/ircd/m_away.c
+++ b/ircd/m_away.c
@@ -84,6 +84,7 @@
 #include "client.h"
 #include "ircd.h"
 #include "ircd_alloc.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "msg.h"
@@ -92,7 +93,7 @@
 #include "s_user.h"
 #include "send.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <string.h>
 
 /*

diff --git a/ircd/m_burst.c b/ircd/m_burst.c
index 62a3e363a38d7eb57d8ff40efc8ce520bd8900cb..6618ebc8857a95656336fe201e01432755ba827e 100644 (file)
--- a/ircd/m_burst.c
+++ b/ircd/m_burst.c
@@ -87,6 +87,7 @@
 #include "ircd.h"
 #include "ircd_alloc.h"
 #include "ircd_features.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "list.h"
@@ -100,7 +101,7 @@
 #include "struct.h"
 #include "ircd_snprintf.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>

diff --git a/ircd/m_clearmode.c b/ircd/m_clearmode.c
index c8d3516be58eaa1b85b6db2076c2242bbd24af2c..35ddea9cffb587393f95d9b8c3e2ec15cbe8fd91 100644 (file)
--- a/ircd/m_clearmode.c
+++ b/ircd/m_clearmode.c
@@ -98,7 +98,7 @@
 #include "s_conf.h"
 #include "send.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 
 /*
  * do_clearmode(struct Client *cptr, struct Client *sptr,

diff --git a/ircd/m_close.c b/ircd/m_close.c
index b121a8338339f9a67555eb4e51441cb189840456..d8e519459910d84f487dad702b4dd2b53e9fca94 100644 (file)
--- a/ircd/m_close.c
+++ b/ircd/m_close.c
@@ -83,12 +83,13 @@
 
 #include "client.h"
 #include "ircd.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "numeric.h"
 #include "s_bsd.h"
 #include "send.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 
 /*
  * mo_close - oper message handler

diff --git a/ircd/m_connect.c b/ircd/m_connect.c
index 55feddd1732b495b2472ad8754d0a7ade56fbf11..d87b20a2249de990f7c43bbcb8ba9c54a35d8f62 100644 (file)
--- a/ircd/m_connect.c
+++ b/ircd/m_connect.c
@@ -99,7 +99,7 @@
 #include "s_user.h"
 #include "send.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <stdlib.h>
 
 /*

diff --git a/ircd/m_cprivmsg.c b/ircd/m_cprivmsg.c
index f714d8f2dcebc95381f32e4891f3b9aa06ef18bf..afda1bc99ba3e6718fd4362b000ae91f32ad7fe5 100644 (file)
--- a/ircd/m_cprivmsg.c
+++ b/ircd/m_cprivmsg.c
@@ -82,11 +82,12 @@
 #include "config.h"
 
 #include "client.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "s_user.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 
 /*
  * m_cprivmsg - generic message handler

diff --git a/ircd/m_create.c b/ircd/m_create.c
index 96cf3af23c515b42181c66c164686e9c971cd980..09f5395a5e571c02dbe4e7694de403e2811d2848 100644 (file)
--- a/ircd/m_create.c
+++ b/ircd/m_create.c
@@ -85,6 +85,7 @@
 #include "client.h"
 #include "hash.h"
 #include "ircd.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "msg.h"
@@ -95,7 +96,7 @@
 #include "s_user.h"
 #include "send.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/ircd/m_defaults.c b/ircd/m_defaults.c
index 9afe5c035f177b54fcbfb3eb52e66642484ba5ce..9a85c82e038287010e1eedddecdb977af8dc1bf2 100644 (file)
--- a/ircd/m_defaults.c
+++ b/ircd/m_defaults.c
@@ -26,6 +26,7 @@
 
 #include "client.h"
 #include "ircd.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "numeric.h"
 #include "numnicks.h"
@@ -33,7 +34,7 @@
 #include "supported.h"
 #include "version.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 
 /*
  * m_functions execute protocol messages on this server:

diff --git a/ircd/m_destruct.c b/ircd/m_destruct.c
index 4104af14bc7a6222b5cf3dbbf476f0a43389a705..8fca75a636796864826a757e5e6de2467b8edd68 100644 (file)
--- a/ircd/m_destruct.c
+++ b/ircd/m_destruct.c
@@ -27,6 +27,7 @@
 #include "client.h"
 #include "hash.h"
 #include "ircd.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "msg.h"
@@ -36,7 +37,7 @@
 #include "channel.h"
 #include "destruct_event.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <stdlib.h>
 
 /*

diff --git a/ircd/m_desynch.c b/ircd/m_desynch.c
index e02a4d46a7fb0fa986ba6239d7be5c7a21966c35..a8533ac2a3a264f28bc02d9cb6264409052dde28 100644 (file)
--- a/ircd/m_desynch.c
+++ b/ircd/m_desynch.c
@@ -84,6 +84,7 @@
 #include "client.h"
 #include "hash.h"
 #include "ircd.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "msg.h"
@@ -92,7 +93,7 @@
 #include "s_bsd.h"
 #include "send.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 
 /*
  * ms_desynch - server message handler

diff --git a/ircd/m_die.c b/ircd/m_die.c
index 9b3519d63fae26bdd9416586d7d79b27bdcff6d7..e8f9ccc2e1667ca61c12e6d228204d88460803d3 100644 (file)
--- a/ircd/m_die.c
+++ b/ircd/m_die.c
@@ -83,6 +83,7 @@
 
 #include "client.h"
 #include "ircd.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "msg.h"
@@ -91,7 +92,7 @@
 #include "s_bsd.h"
 #include "send.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 
 
 /*

diff --git a/ircd/m_endburst.c b/ircd/m_endburst.c
index 68ac9e11490161c7f0eb0b235b9579e03c8d2e74..aea0decf8ae8544f839e84a80dd5a9f1d6cc78e0 100644 (file)
--- a/ircd/m_endburst.c
+++ b/ircd/m_endburst.c
@@ -85,6 +85,7 @@
 #include "client.h"
 #include "hash.h"
 #include "ircd.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "msg.h"
@@ -92,7 +93,7 @@
 #include "numnicks.h"
 #include "send.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 
 /*
  * ms_end_of_burst - server message handler

diff --git a/ircd/m_error.c b/ircd/m_error.c
index b84b20f243d080cb201598de3faa3597dab8d688..561fbcffffb44cfe5a673ecb1dda083f135dfbc3 100644 (file)
--- a/ircd/m_error.c
+++ b/ircd/m_error.c
@@ -85,6 +85,7 @@
 #include "hash.h"
 #include "ircd.h"
 #include "ircd_alloc.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "numeric.h"
@@ -93,7 +94,7 @@
 #include "s_misc.h"
 #include "send.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <string.h>
 
 /*

diff --git a/ircd/m_get.c b/ircd/m_get.c
index 29829955573b7afd7871e1442de904e2809bf9dd..ac7e6e5dc4653a8a40ae7a6ece3d5b3d3954887e 100644 (file)
--- a/ircd/m_get.c
+++ b/ircd/m_get.c
@@ -85,13 +85,14 @@
 #include "hash.h"
 #include "ircd.h"
 #include "ircd_features.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "numeric.h"
 #include "numnicks.h"
 #include "send.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 
 /*
  * mo_get - oper message handler

diff --git a/ircd/m_gline.c b/ircd/m_gline.c
index 636879cc422c72279cfe347462d95f04339d39ae..ab60a1a81b6d7e96f4f438e2f4ad7a3b2302ddd3 100644 (file)
--- a/ircd/m_gline.c
+++ b/ircd/m_gline.c
@@ -86,6 +86,7 @@
 #include "hash.h"
 #include "ircd.h"
 #include "ircd_features.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "match.h"
@@ -96,7 +97,7 @@
 #include "s_misc.h"
 #include "send.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/ircd/m_help.c b/ircd/m_help.c
index 1c09943156baa4f223c2408521b98fe1253613e9..482ad8e8e7c3a0a86d7eb34acb7fdb2ddbe0826b 100644 (file)
--- a/ircd/m_help.c
+++ b/ircd/m_help.c
@@ -84,6 +84,7 @@
 #include "client.h"
 #include "hash.h"
 #include "ircd.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "msg.h"
@@ -91,7 +92,7 @@
 #include "numnicks.h"
 #include "send.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 
 /*
  * m_help - generic message handler

diff --git a/ircd/m_info.c b/ircd/m_info.c
index 5a547ec430b0d89ad8aaf69bf65cc8f36b063a94..0f18c438c97f189a69bb488c00c0b50444feb6bd 100644 (file)
--- a/ircd/m_info.c
+++ b/ircd/m_info.c
@@ -83,6 +83,7 @@
 
 #include "client.h"
 #include "ircd.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "msg.h"
@@ -94,7 +95,7 @@
 #include "send.h"
 #include "version.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 
 /*
  * m_info - generic message handler

diff --git a/ircd/m_invite.c b/ircd/m_invite.c
index 4a99cfeeb08bf15822dca45dbb4a80034f7ff5e8..2b8cbcff0980fbe478960b14c4fbb7b4b2d9b338 100644 (file)
--- a/ircd/m_invite.c
+++ b/ircd/m_invite.c
@@ -86,6 +86,7 @@
 #include "hash.h"
 #include "ircd.h"
 #include "ircd_features.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "list.h"
@@ -96,7 +97,7 @@
 #include "send.h"
 #include "struct.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 
 /*
  * m_invite - generic message handler

diff --git a/ircd/m_ison.c b/ircd/m_ison.c
index 1dfa6f2c5b850fb8ea5c4f15c66103cdc952c47f..e5f232f832ddf3170094fe8fa7faf25dec197ec9 100644 (file)
--- a/ircd/m_ison.c
+++ b/ircd/m_ison.c
@@ -84,13 +84,14 @@
 #include "client.h"
 #include "hash.h"
 #include "ircd.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "msgq.h"
 #include "numeric.h"
 #include "send.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <string.h>
 
 /*

diff --git a/ircd/m_join.c b/ircd/m_join.c
index 76eb13867d65b8b581e510cf01700b3a78af243d..59c667dd8ca4042ec9c53bab847ac79ecd73042e 100644 (file)
--- a/ircd/m_join.c
+++ b/ircd/m_join.c
@@ -88,6 +88,7 @@
 #include "ircd.h"
 #include "ircd_chattr.h"
 #include "ircd_features.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "msg.h"
@@ -97,7 +98,7 @@
 #include "s_user.h"
 #include "send.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/ircd/m_jupe.c b/ircd/m_jupe.c
index 7d89ee5965ca50812bf48770ab3abdc95e544c26..688dde3666e273f884133797897b59c7759d7dc5 100644 (file)
--- a/ircd/m_jupe.c
+++ b/ircd/m_jupe.c
@@ -87,6 +87,7 @@
 #include "hash.h"
 #include "ircd.h"
 #include "ircd_features.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "match.h"
@@ -97,7 +98,7 @@
 #include "s_misc.h"
 #include "send.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/ircd/m_kick.c b/ircd/m_kick.c
index 56fad4287c646ae03aee90b10f0d4d25a9353a29..5af0a4d3d85246c6ff61d6ec81fd48d9a0be53b4 100644 (file)
--- a/ircd/m_kick.c
+++ b/ircd/m_kick.c
@@ -85,6 +85,7 @@
 #include "client.h"
 #include "hash.h"
 #include "ircd.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "msg.h"
@@ -93,7 +94,7 @@
 #include "send.h"
 #include "ircd_features.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 
 /*
  * m_kick - generic message handler

diff --git a/ircd/m_kill.c b/ircd/m_kill.c
index b46b78228337af2c50361144f2cbf2abfa805b39..1957fa157239e77c29ee1ccf952f428626203ff9 100644 (file)
--- a/ircd/m_kill.c
+++ b/ircd/m_kill.c
@@ -96,7 +96,7 @@
 #include "send.h"
 #include "whowas.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <string.h>
 
 /*

diff --git a/ircd/m_links.c b/ircd/m_links.c
index cd9014511f3176b8f908ce5356aa229f256d769d..68bf87fd92fc1edc781f9b1c37b0f4847ac2a681 100644 (file)
--- a/ircd/m_links.c
+++ b/ircd/m_links.c
@@ -85,6 +85,7 @@
 #include "ircd.h"
 #include "ircd_defs.h"
 #include "ircd_features.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "match.h"
@@ -95,7 +96,7 @@
 #include "send.h"
 #include "struct.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 
 /*
  * m_links - generic message handler

diff --git a/ircd/m_list.c b/ircd/m_list.c
index 9c96a118d692c33dec4efbaa9d136d7b35741418..471743b838062d2bf1dc3e2fe67d15d62361b04c 100644 (file)
--- a/ircd/m_list.c
+++ b/ircd/m_list.c
@@ -97,7 +97,7 @@
 #include "s_bsd.h"
 #include "send.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/ircd/m_lusers.c b/ircd/m_lusers.c
index 07c562b4439856ed23fc4b570ce741ee1090c5d0..b1b7afdc9dfb5bae93d1b12524414335e96c94fa 100644 (file)
--- a/ircd/m_lusers.c
+++ b/ircd/m_lusers.c
@@ -84,6 +84,7 @@
 #include "client.h"
 #include "ircd.h"
 #include "ircd_features.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "msg.h"
@@ -94,7 +95,7 @@
 #include "s_serv.h"
 #include "send.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 
 /*
  * m_lusers - generic message handler

diff --git a/ircd/m_map.c b/ircd/m_map.c
index ca1f0bfb3e787f5f941a60aead05f10e37d40f9a..ffbcb183ab0d8ead99605c2b3985759c8daffe14 100644 (file)
--- a/ircd/m_map.c
+++ b/ircd/m_map.c
@@ -85,6 +85,7 @@
 #include "ircd.h"
 #include "ircd_defs.h"
 #include "ircd_features.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_snprintf.h"
 #include "ircd_string.h"
@@ -97,7 +98,7 @@
 #include "send.h"
 #include "querycmds.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <stdio.h>
 #include <string.h>
 

diff --git a/ircd/m_mode.c b/ircd/m_mode.c
index c0b514893078f9ed420ebb758b902cba165b26d2..fb957a4bbd3c89fc3cd53e5ce5fd92fe841d581b 100644 (file)
--- a/ircd/m_mode.c
+++ b/ircd/m_mode.c
@@ -86,6 +86,7 @@
 #include "client.h"
 #include "hash.h"
 #include "ircd.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "msg.h"
@@ -96,7 +97,7 @@
 #include "s_user.h"
 #include "send.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/ircd/m_motd.c b/ircd/m_motd.c
index e2cd87ded6c2369bf307bcf2f36e027687abfbd4..f431df1e5a906a5a0f8db635c7df343ac7cab7d6 100644 (file)
--- a/ircd/m_motd.c
+++ b/ircd/m_motd.c
@@ -84,6 +84,7 @@
 #include "client.h"
 #include "ircd.h"
 #include "ircd_features.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "match.h"
@@ -97,7 +98,7 @@
 #include "send.h"
 
 #include <stdlib.h>
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 
 /*
  * m_motd - generic message handler

diff --git a/ircd/m_names.c b/ircd/m_names.c
index 2ee0c65b1f67ea2f3a0cc52165131164682574d7..bddfd2795b5a2bba07d5b6255e80382270799add 100644 (file)
--- a/ircd/m_names.c
+++ b/ircd/m_names.c
@@ -85,6 +85,7 @@
 #include "client.h"
 #include "hash.h"
 #include "ircd.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "msg.h"
@@ -93,7 +94,7 @@
 #include "s_user.h"
 #include "send.h"
  
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <string.h>
 
 /*

diff --git a/ircd/m_nick.c b/ircd/m_nick.c
index d993a66f3d16b54402cfe28e14141673ad960960..18ecca5746c96994bfc82a57a33ecc4c016684aa 100644 (file)
--- a/ircd/m_nick.c
+++ b/ircd/m_nick.c
@@ -87,6 +87,7 @@
 #include "ircd.h"
 #include "ircd_chattr.h"
 #include "ircd_features.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "msg.h"
@@ -98,7 +99,7 @@
 #include "send.h"
 #include "sys.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/ircd/m_notice.c b/ircd/m_notice.c
index 0d76c2f0639eb85912f7a41a3792092960370f62..6f2d295f37ab1616f4053ee9a296d5f870ed9145 100644 (file)
--- a/ircd/m_notice.c
+++ b/ircd/m_notice.c
@@ -83,6 +83,7 @@
 
 #include "client.h"
 #include "ircd_chattr.h"
+#include "ircd_log.h"
 #include "ircd_relay.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
@@ -91,7 +92,7 @@
 #include "numeric.h"
 #include "send.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <string.h>
 
 #if !defined(XXX_BOGUS_TEMP_HACK)

diff --git a/ircd/m_oper.c b/ircd/m_oper.c
index d0e85a12e3f0bc1dc5a7e2d8548ba999ace556b7..3e561ebf32918dec8d68e76c35ce79f263a0757c 100644 (file)
--- a/ircd/m_oper.c
+++ b/ircd/m_oper.c
@@ -100,7 +100,7 @@
 #include "s_misc.h"
 #include "send.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/ircd/m_opmode.c b/ircd/m_opmode.c
index 0f7ae4ba7b295f988742d4ea06491e7871ffc35e..142f38b4e8f216db94a0692c85eca33428d707fc 100644 (file)
--- a/ircd/m_opmode.c
+++ b/ircd/m_opmode.c
@@ -87,6 +87,7 @@
 #include "hash.h"
 #include "ircd.h"
 #include "ircd_features.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "msg.h"
@@ -95,7 +96,7 @@
 #include "send.h"
 #include "s_conf.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 
 /*
  * ms_opmode - server message handler

diff --git a/ircd/m_part.c b/ircd/m_part.c
index 00da1ef64f5d07fbb9d763e92ff2ccda2e385420..fd90fbbec6bc6b2249930ef3954054b7d587b0af 100644 (file)
--- a/ircd/m_part.c
+++ b/ircd/m_part.c
@@ -85,13 +85,14 @@
 #include "client.h"
 #include "hash.h"
 #include "ircd.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "numeric.h"
 #include "numnicks.h"
 #include "send.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <string.h>
 
 /*

diff --git a/ircd/m_pass.c b/ircd/m_pass.c
index 5848c0e7883a7ffb8f5282ea04a6d9494f9c88b2..d25d8a93f5ed9264de3a3cb9ff0a55f85aa5fe57 100644 (file)
--- a/ircd/m_pass.c
+++ b/ircd/m_pass.c
@@ -82,11 +82,12 @@
 #include "config.h"
 
 #include "client.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "send.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 
 /*
  * mr_pass - registration message handler

diff --git a/ircd/m_ping.c b/ircd/m_ping.c
index 609e00d457e394e5aadba97240ddf9b9ae017cb0..6766b60797b66683e2ecf8dd9aad614116fcf87f 100644 (file)
--- a/ircd/m_ping.c
+++ b/ircd/m_ping.c
@@ -134,6 +134,7 @@
 
 #include "client.h"
 #include "hash.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "ircd.h"
@@ -144,7 +145,7 @@
 #include "s_debug.h"
 #include "send.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/ircd/m_pong.c b/ircd/m_pong.c
index 026cd6bbeee40ac06cc501f04150a12dd9bbc972..e149c23d81d4bffd18e4880a49c10ec15dc2489f 100644 (file)
--- a/ircd/m_pong.c
+++ b/ircd/m_pong.c
@@ -84,6 +84,7 @@
 #include "client.h"
 #include "hash.h"
 #include "ircd.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "msg.h"
@@ -93,7 +94,7 @@
 #include "s_user.h"
 #include "send.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <string.h>
 #include <stdlib.h>
 

diff --git a/ircd/m_privmsg.c b/ircd/m_privmsg.c
index 28e6fd41060f0f76bdb73d24b28dbb56f24163bf..b9928dc192b146d85bf6d52991eb6701cbebe101 100644 (file)
--- a/ircd/m_privmsg.c
+++ b/ircd/m_privmsg.c
@@ -85,6 +85,7 @@
 #include "ircd.h"
 #include "ircd_chattr.h"
 #include "ircd_features.h"
+#include "ircd_log.h"
 #include "ircd_relay.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
@@ -93,7 +94,7 @@
 #include "numeric.h"
 #include "send.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <string.h>
 
 /*

diff --git a/ircd/m_privs.c b/ircd/m_privs.c
index f72f38caab05f8d9c349bc7174788dc340579fe6..b36e8b87dfd96c647d8188d624ad41dde61d931e 100644 (file)
--- a/ircd/m_privs.c
+++ b/ircd/m_privs.c
@@ -84,13 +84,14 @@
 #include "client.h"
 #include "hash.h"
 #include "ircd.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "numeric.h"
 #include "numnicks.h"
 #include "send.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 
 /*
  * mo_privs - report operator privileges

diff --git a/ircd/m_proto.c b/ircd/m_proto.c
index 3a9f3ca6d5cf45405aa1a52c2e7708fba13bcb3b..4bf0a068534d6affb809566ae9d8111d469d4a1f 100644 (file)
--- a/ircd/m_proto.c
+++ b/ircd/m_proto.c
@@ -28,6 +28,7 @@
 #include "ircd.h"
 #include "ircd_alloc.h"
 #include "ircd_chattr.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "msg.h"
@@ -39,7 +40,7 @@
 #include "supported.h"
 #include "version.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/ircd/m_pseudo.c b/ircd/m_pseudo.c
index 544fe627d2aa5af810ecb4cd4a838a923615fb17..b4a17a43655bdd8f9b7ba0e3d6a992878180418d 100644 (file)
--- a/ircd/m_pseudo.c
+++ b/ircd/m_pseudo.c
@@ -85,6 +85,7 @@
 #include "hash.h"
 #include "ircd.h"
 #include "ircd_features.h"
+#include "ircd_log.h"
 #include "ircd_relay.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
@@ -95,7 +96,7 @@
 #include "s_conf.h"
 #include "s_user.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 
 /*
  * m_pseudo - generic service message handler

diff --git a/ircd/m_quit.c b/ircd/m_quit.c
index a96d434cbe53977e29d6cc0298f47fb8e7490739..9ccc361566d6e0078a7766ad4ab7551b79c53e29 100644 (file)
--- a/ircd/m_quit.c
+++ b/ircd/m_quit.c
@@ -84,12 +84,13 @@
 #include "channel.h"
 #include "client.h"
 #include "ircd.h"
+#include "ircd_log.h"
 #include "ircd_string.h"
 #include "struct.h"
 #include "s_misc.h"
 #include "ircd_reply.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <string.h>
 
 /*

diff --git a/ircd/m_rehash.c b/ircd/m_rehash.c
index e14df3806c783815de72f72a2c27f142ef8e45b6..8e8c2db6f6151111f47f0812e409884a25ec809d 100644 (file)
--- a/ircd/m_rehash.c
+++ b/ircd/m_rehash.c
@@ -91,7 +91,7 @@
 #include "s_conf.h"
 #include "send.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 
 /*
  * mo_rehash - oper message handler

diff --git a/ircd/m_reset.c b/ircd/m_reset.c
index 3c48e17ca5504ee3ea6539884b3b7b52c09297d4..624cb86e386ffaec69c79275b50825afd18acbf5 100644 (file)
--- a/ircd/m_reset.c
+++ b/ircd/m_reset.c
@@ -85,13 +85,14 @@
 #include "hash.h"
 #include "ircd.h"
 #include "ircd_features.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "numeric.h"
 #include "numnicks.h"
 #include "send.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 
 /*
  * mo_reset - oper message handler

diff --git a/ircd/m_restart.c b/ircd/m_restart.c
index b031161d24f91408c9a7fc9a303985a44eca30ab..08246db0b32fd07e6fd4ed012b6fdd286eb2255d 100644 (file)
--- a/ircd/m_restart.c
+++ b/ircd/m_restart.c
@@ -90,7 +90,7 @@
 #include "numnicks.h"
 #include "send.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 
 /*
  * mo_restart - oper message handler

diff --git a/ircd/m_rping.c b/ircd/m_rping.c
index 384139016ab6acc0503cdd74f738b52346585391..1db4b239174a047c2bd6d70eb4b08eaf4cdf324d 100644 (file)
--- a/ircd/m_rping.c
+++ b/ircd/m_rping.c
@@ -84,6 +84,7 @@
 #include "client.h"
 #include "hash.h"
 #include "ircd.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "msg.h"
@@ -93,7 +94,7 @@
 #include "s_user.h"
 #include "send.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 
 
 /*

diff --git a/ircd/m_rpong.c b/ircd/m_rpong.c
index fc2cb42c4b93d5f5ed49a694400a4c204b6c7cf5..4f32f79e1446b633b2311a363e1b7ed5f4e42688 100644 (file)
--- a/ircd/m_rpong.c
+++ b/ircd/m_rpong.c
@@ -84,6 +84,7 @@
 #include "client.h"
 #include "hash.h"
 #include "ircd.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "msg.h"
@@ -92,7 +93,7 @@
 #include "opercmds.h"
 #include "send.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 
 /*
  * ms_rpong - server message handler

diff --git a/ircd/m_server.c b/ircd/m_server.c
index a15f66b6d07abc1c52dc816a43c9106b81e76ca3..af7a010a80a6d1a597206d665984663fe4d2301b 100644 (file)
--- a/ircd/m_server.c
+++ b/ircd/m_server.c
@@ -49,7 +49,7 @@
 #include "send.h"
 #include "userload.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/ircd/m_set.c b/ircd/m_set.c
index 4cca91af010a385363c562115a0ca308f47bbc4d..861f228448543c672b3a2a8caa06598025f8a900 100644 (file)
--- a/ircd/m_set.c
+++ b/ircd/m_set.c
@@ -85,13 +85,14 @@
 #include "hash.h"
 #include "ircd.h"
 #include "ircd_features.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "numeric.h"
 #include "numnicks.h"
 #include "send.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 
 /*
  * mo_set - oper message handler

diff --git a/ircd/m_settime.c b/ircd/m_settime.c
index 30643a741c83d736092267c40956c66cddde2a93..39ec6aa39a708c926bba9ce48e14d542515dc925 100644 (file)
--- a/ircd/m_settime.c
+++ b/ircd/m_settime.c
@@ -85,6 +85,7 @@
 #include "hash.h"
 #include "ircd.h"
 #include "ircd_features.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_snprintf.h"
 #include "ircd_string.h"
@@ -96,7 +97,7 @@
 #include "send.h"
 #include "struct.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <stdlib.h>
 
 /*

diff --git a/ircd/m_silence.c b/ircd/m_silence.c
index a3baa5124a6c8f279edc55f5d35f06d192298dc2..7a78d14dbfea4d1b681e087a7751c415c89d08dc 100644 (file)
--- a/ircd/m_silence.c
+++ b/ircd/m_silence.c
@@ -32,6 +32,7 @@
 #include "hash.h"
 #include "ircd.h"
 #include "ircd_features.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_snprintf.h"
 #include "ircd_string.h"
@@ -43,7 +44,7 @@
 #include "send.h"
 #include "struct.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/ircd/m_squit.c b/ircd/m_squit.c
index c0282fec811f9d2252b0c24ea5c0f416929cb95f..ce4dd9991c99cea160e30dbefa21550f9029ba9a 100644 (file)
--- a/ircd/m_squit.c
+++ b/ircd/m_squit.c
@@ -28,6 +28,7 @@
 #include "hash.h"
 #include "ircd.h"
 #include "ircd_chattr.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "numeric.h"
@@ -38,7 +39,7 @@
 #include "s_user.h"
 #include "send.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/ircd/m_stats.c b/ircd/m_stats.c
index 34a7464f12699b892673f2d823ae2b5fc3f40aa0..73cfe8196069da8a9be353cf16c20b35b5f4f0bd 100644 (file)
--- a/ircd/m_stats.c
+++ b/ircd/m_stats.c
@@ -84,6 +84,7 @@
 #include "client.h"
 #include "ircd.h"
 #include "ircd_features.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "msg.h"
@@ -93,7 +94,7 @@
 #include "send.h"
 #include "struct.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/ircd/m_time.c b/ircd/m_time.c
index d21646542e19a57c919c25125074d484792f6525..ca8e83018c7763a71109c9f586897bdc8ffbf69f 100644 (file)
--- a/ircd/m_time.c
+++ b/ircd/m_time.c
@@ -84,6 +84,7 @@
 #include "client.h"
 #include "ircd.h"
 #include "ircd_features.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "msg.h"
@@ -93,7 +94,7 @@
 #include "s_user.h"
 #include "send.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 
 /*
  * m_time - generic message handler

diff --git a/ircd/m_tmpl.c b/ircd/m_tmpl.c
index 24aaaaa80145293dc559102c3b1c33da7c3df834..88480ee129d2ddfdd5f2d5c6a9575670231d998c 100644 (file)
--- a/ircd/m_tmpl.c
+++ b/ircd/m_tmpl.c
@@ -84,13 +84,14 @@
 #include "client.h"
 #include "hash.h"
 #include "ircd.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "numeric.h"
 #include "numnicks.h"
 #include "send.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 
 /*
  * m_tmpl - generic message handler

diff --git a/ircd/m_topic.c b/ircd/m_topic.c
index 2a4c55985f94150bba25e6059ae8479a7168b6ff..d0c674c757d4a62cdd693818f855eb241bb122e1 100644 (file)
--- a/ircd/m_topic.c
+++ b/ircd/m_topic.c
@@ -86,6 +86,7 @@
 #include "hash.h"
 #include "ircd.h"
 #include "ircd_features.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "msg.h"
@@ -93,7 +94,7 @@
 #include "numnicks.h"
 #include "send.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <stdlib.h> /* for atoi() */
 
 static void do_settopic(struct Client *sptr, struct Client *cptr, 

diff --git a/ircd/m_trace.c b/ircd/m_trace.c
index e311682a443778f8557571e1c1126603e2aef21d..e261ac5105c6da091b25852b33b134648b1c329c 100644 (file)
--- a/ircd/m_trace.c
+++ b/ircd/m_trace.c
@@ -86,6 +86,7 @@
 #include "hash.h"
 #include "ircd.h"
 #include "ircd_features.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "match.h"
@@ -98,7 +99,7 @@
 #include "send.h"
 #include "version.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <string.h>
 
 void do_trace(struct Client *cptr, struct Client *sptr, int parc, char *parv[])

diff --git a/ircd/m_uping.c b/ircd/m_uping.c
index cc10cf917e4d83837b823614e73fe364a0f2556b..8854a247295f38222a3f8c9177faa6ac99439e02 100644 (file)
--- a/ircd/m_uping.c
+++ b/ircd/m_uping.c
@@ -84,6 +84,7 @@
 #include "client.h"
 #include "hash.h"
 #include "ircd.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "match.h"
@@ -96,7 +97,7 @@
 #include "uping.h"
 
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/ircd/m_user.c b/ircd/m_user.c
index 06a8917de069768ea4bfe729cf9b284661e5aa81..33dd470ce18c50d5f829cf0059d1eed779128f57 100644 (file)
--- a/ircd/m_user.c
+++ b/ircd/m_user.c
@@ -85,6 +85,7 @@
 #include "client.h"
 #include "ircd.h"
 #include "ircd_chattr.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "numeric.h"
@@ -94,7 +95,7 @@
 #include "s_user.h"
 #include "send.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/ircd/m_userhost.c b/ircd/m_userhost.c
index 9f93381c1d02de798fc1c2c2fff8b812a683226d..0d49fceb3b902dc0424b4abe860eb21b57e31c0d 100644 (file)
--- a/ircd/m_userhost.c
+++ b/ircd/m_userhost.c
@@ -82,6 +82,7 @@
 #include "config.h"
 
 #include "client.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "msgq.h"
@@ -89,7 +90,7 @@
 #include "s_user.h"
 #include "struct.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 
 static void userhost_formatter(struct Client* cptr, struct Client *sptr, struct MsgBuf* mb)
 {

diff --git a/ircd/m_userip.c b/ircd/m_userip.c
index 80078ff2c54b7420fbbe3b403fe63448e3d80e78..82f2b45517b403c53ddfb3d4851d2922f0ce83f3 100644 (file)
--- a/ircd/m_userip.c
+++ b/ircd/m_userip.c
@@ -85,12 +85,13 @@
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "ircd_features.h"
+#include "ircd_log.h"
 #include "msgq.h"
 #include "numeric.h"
 #include "s_user.h"
 #include "struct.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 
 static void userip_formatter(struct Client* cptr, struct Client *sptr, struct MsgBuf* mb)
 {

diff --git a/ircd/m_version.c b/ircd/m_version.c
index 39e6cd3d775ebe1c92eff4b26b135826418d602e..340991b81ccf114aa6911c940f3c5023d3f85bd9 100644 (file)
--- a/ircd/m_version.c
+++ b/ircd/m_version.c
@@ -85,6 +85,7 @@
 #include "hash.h"
 #include "ircd.h"
 #include "ircd_features.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_snprintf.h"
 #include "ircd_string.h"
@@ -97,7 +98,7 @@
 #include "supported.h"
 #include "version.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 
 /*
  * m_version - generic message handler

diff --git a/ircd/m_wallchops.c b/ircd/m_wallchops.c
index d9732be9ebcf698170d8da549b3e2a9fe2ce0e25..a3a91339eaddc343b5044c04a09c3ac23fb71d6e 100644 (file)
--- a/ircd/m_wallchops.c
+++ b/ircd/m_wallchops.c
@@ -85,6 +85,7 @@
 #include "client.h"
 #include "hash.h"
 #include "ircd.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "msg.h"
@@ -93,7 +94,7 @@
 #include "s_user.h"
 #include "send.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 
 /*
  * m_wallchops - local generic message handler

diff --git a/ircd/m_wallops.c b/ircd/m_wallops.c
index 5c98a2400a6dd18c54371a83194b2fb6c4b0a6a3..dfa10e48ef071d71b946684d760b9d81d0513dca 100644 (file)
--- a/ircd/m_wallops.c
+++ b/ircd/m_wallops.c
@@ -82,13 +82,14 @@
 #include "config.h"
 
 #include "client.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "msg.h"
 #include "numeric.h"
 #include "send.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 
 
 /*

diff --git a/ircd/m_wallusers.c b/ircd/m_wallusers.c
index e5e0cdb61762d9846fb385a51e31ae414e4c16a1..dc53baab7284b89ce204787886042502f02ff49b 100644 (file)
--- a/ircd/m_wallusers.c
+++ b/ircd/m_wallusers.c
@@ -82,13 +82,14 @@
 #include "config.h"
 
 #include "client.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "msg.h"
 #include "numeric.h"
 #include "send.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 
 
 /*

diff --git a/ircd/m_wallvoices.c b/ircd/m_wallvoices.c
index 4dfad262dc6cd4500e21b708e7b54173b7460717..2fdc5f3fdef3b353dcc311259e7d38ea1a5e0c88 100644 (file)
--- a/ircd/m_wallvoices.c
+++ b/ircd/m_wallvoices.c
@@ -84,6 +84,7 @@
 #include "client.h"
 #include "hash.h"
 #include "ircd.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "msg.h"
@@ -92,7 +93,7 @@
 #include "s_user.h"
 #include "send.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 
 /*
  * m_wallvoices - local generic message handler

diff --git a/ircd/m_who.c b/ircd/m_who.c
index 04075ca0a3d3696c58a48da62316493ac2147918..35b40939d8ecca9763f32ac91dceabe2723d3ad1 100644 (file)
--- a/ircd/m_who.c
+++ b/ircd/m_who.c
@@ -96,7 +96,7 @@
 #include "send.h"
 #include "whocmds.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <string.h>
 
 

diff --git a/ircd/m_whois.c b/ircd/m_whois.c
index 343ca82d7af9414ed91bcaa8574367e693e4b2bb..5ba4a460fbb8deb2fd9124d759531d0dadb89a4f 100644 (file)
--- a/ircd/m_whois.c
+++ b/ircd/m_whois.c
@@ -86,6 +86,7 @@
 #include "hash.h"
 #include "ircd.h"
 #include "ircd_features.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "match.h"
@@ -96,7 +97,7 @@
 #include "send.h"
 #include "whocmds.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <string.h>
 
 /*

diff --git a/ircd/m_whowas.c b/ircd/m_whowas.c
index f6a4cdfebb1e3515a277762d6cab4962c0580af8..bea409ac8c8b545c7247fed598ab1142056d767a 100644 (file)
--- a/ircd/m_whowas.c
+++ b/ircd/m_whowas.c
@@ -85,6 +85,7 @@
 #include "hash.h"
 #include "ircd.h"
 #include "ircd_features.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "msg.h"
@@ -95,7 +96,7 @@
 #include "send.h"
 #include "whowas.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <stdlib.h>
 
 /*

diff --git a/ircd/memdebug.c b/ircd/memdebug.c
index 0c84ea14fc8cab048d13f35b6f547f0732568670..8e998209e0494d17e7e3db87bc2b7304e7e5785d 100644 (file)
--- a/ircd/memdebug.c
+++ b/ircd/memdebug.c
@@ -1,11 +1,12 @@
 #include <sys/types.h>
 #include "ircd.h"
 #include "ircd_alloc.h"
+#include "ircd_log.h"
 #include "client.h"
 #include "s_debug.h"
 #include <stdlib.h>
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 
 #ifdef MDEBUG
 

diff --git a/ircd/motd.c b/ircd/motd.c
index 8359f21426648689e4d0104e987a7630d8def482..dc92c97e260d897a6c1a2b79d6e9a0b33956e9e8 100644 (file)
--- a/ircd/motd.c
+++ b/ircd/motd.c
@@ -34,6 +34,7 @@
 #include "ircd.h"
 #include "ircd_alloc.h"
 #include "ircd_features.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "match.h"
@@ -46,7 +47,7 @@
 #include "s_stats.h"
 #include "send.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/ircd/msgq.c b/ircd/msgq.c
index 2eeda9977cfb0fa7d04449087d8cd5bfd6f83104..1119214e2d9a1c938bef5c8330c9b49e002f46e4 100644 (file)
--- a/ircd/msgq.c
+++ b/ircd/msgq.c
@@ -27,6 +27,7 @@
 #include "ircd_alloc.h"
 #include "ircd_defs.h"
 #include "ircd_features.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_snprintf.h"
 #include "numeric.h"
@@ -34,7 +35,7 @@
 #include "s_debug.h"
 #include "s_stats.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <stdarg.h>
 #include <string.h>
 #include <sys/types.h>

diff --git a/ircd/numnicks.c b/ircd/numnicks.c
index f84c335f3a98464d8b0ebe8c4ab5b8436ac50371..931c1ca83b0eb53f38f54bca93fbf5e317f18521 100644 (file)
--- a/ircd/numnicks.c
+++ b/ircd/numnicks.c
@@ -26,6 +26,7 @@
 #include "client.h"
 #include "ircd.h"
 #include "ircd_alloc.h"
+#include "ircd_log.h"
 #include "ircd_string.h"
 #include "match.h"
 #include "s_bsd.h"
@@ -33,7 +34,7 @@
 #include "s_misc.h"
 #include "struct.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/ircd/os_generic.c b/ircd/os_generic.c
index 9191b387303639541a7925fd1c407dc296920464..3f52e76cd1e9e0aa7ecd121b08ca8e240065b63d 100644 (file)
--- a/ircd/os_generic.c
+++ b/ircd/os_generic.c
@@ -27,6 +27,7 @@
 
 #include "ircd_osdep.h"
 #include "msgq.h"
+#include "ircd_log.h"
 #include "res.h"
 #include "s_bsd.h"
 #include "sys.h"
@@ -37,7 +38,7 @@
  * Solaris requires sys/time.h before struct rusage (indirectly) in
  * netinet/in.h.
  */
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>

diff --git a/ircd/packet.c b/ircd/packet.c
index 87853f6922669539f9b5193f4b9834055e1d37c4..763440864ab2e84ef722f1656d45a25427c7d87e 100644 (file)
--- a/ircd/packet.c
+++ b/ircd/packet.c
@@ -27,12 +27,13 @@
 #include "client.h"
 #include "ircd.h"
 #include "ircd_chattr.h"
+#include "ircd_log.h"
 #include "parse.h"
 #include "s_bsd.h"
 #include "s_misc.h"
 #include "send.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 
 /** Add a certain number of bytes to a client's received statistics.
  * @param[in,out] cptr Client to update.

diff --git a/ircd/parse.c b/ircd/parse.c
index 693d5ecc2afb38d7aae91d940074b5122d1f99f9..ac69fe653449d7c2e0e3ab3c6d0650b04f912bad 100644 (file)
--- a/ircd/parse.c
+++ b/ircd/parse.c
@@ -32,6 +32,7 @@
 #include "ircd_alloc.h"
 #include "ircd_chattr.h"
 #include "ircd_features.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "msg.h"
@@ -52,7 +53,7 @@
 #include "whocmds.h"
 #include "whowas.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <string.h>
 #include <stdlib.h>
 

diff --git a/ircd/s_auth.c b/ircd/s_auth.c
index 5baa898abad1a6ce15b4a3aad425e5a4d06b69a3..2d67d3f3ce333b3af606a59688ce2affa2b7bf06 100644 (file)
--- a/ircd/s_auth.c
+++ b/ircd/s_auth.c
@@ -61,7 +61,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <sys/socket.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>

diff --git a/ircd/s_bsd.c b/ircd/s_bsd.c
index 6a3d9e4619a27afd93b1e71649d1a879091c9b6c..97c63b06382f86cd698409eddb64339569c782da 100644 (file)
--- a/ircd/s_bsd.c
+++ b/ircd/s_bsd.c
@@ -59,7 +59,7 @@
 #include "version.h"
 
 #include <arpa/inet.h>
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <errno.h>
 #include <fcntl.h>
 #include <netdb.h>

diff --git a/ircd/s_conf.c b/ircd/s_conf.c
index 160b4e008230b450f49f8f90ec70b244c71b71f4..12a5ac806fee359a969a2929f013daebe606f8a3 100644 (file)
--- a/ircd/s_conf.c
+++ b/ircd/s_conf.c
@@ -56,7 +56,7 @@
 #include "struct.h"
 #include "sys.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <arpa/inet.h>
 #include <errno.h>
 #include <fcntl.h>

diff --git a/ircd/s_debug.c b/ircd/s_debug.c
index 6f1266cc952cfdbd557408e5d55a0c1d2cb9fb0e..15ea2f547f28f8acdefb9ddd6cf1cf7f4a8334d1 100644 (file)
--- a/ircd/s_debug.c
+++ b/ircd/s_debug.c
@@ -50,7 +50,7 @@
 #include "sys.h"
 #include "whowas.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <errno.h>
 #include <fcntl.h>
 #include <stdarg.h>

diff --git a/ircd/s_err.c b/ircd/s_err.c
index 85f188390bb31ead2560d37cdf219f0034cb6340..041520e1ac18b6e82b0ddfb2f93cf5edbb9e2275 100644 (file)
--- a/ircd/s_err.c
+++ b/ircd/s_err.c
@@ -23,9 +23,10 @@
 #include "config.h"
 
 #include "numeric.h"
+#include "ircd_log.h"
 #include "s_debug.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <string.h>
 
 /** Array of Numeric replies, indexed by numeric. */

diff --git a/ircd/s_misc.c b/ircd/s_misc.c
index 1b892fc287169dba7277fa24d1b452289a21b232..1476f2c6a7a9e475346ebbd8abe74783802c781f 100644 (file)
--- a/ircd/s_misc.c
+++ b/ircd/s_misc.c
@@ -58,7 +58,7 @@
 #include "uping.h"
 #include "userload.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <fcntl.h>
 #include <netdb.h>
 #include <stdio.h>

diff --git a/ircd/s_serv.c b/ircd/s_serv.c
index 1da2bfdd3679ebbd1ba759e5ba0317c9ad198901..2fb07942bc73c3e38ac2528036556da16c5ef1db 100644 (file)
--- a/ircd/s_serv.c
+++ b/ircd/s_serv.c
@@ -34,6 +34,7 @@
 #include "hash.h"
 #include "ircd.h"
 #include "ircd_alloc.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "ircd_snprintf.h"
@@ -57,7 +58,7 @@
 #include "sys.h"
 #include "userload.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/ircd/s_user.c b/ircd/s_user.c
index 5e6ebe3af93eeec424612ed07e5ead69a45b6a8a..3e7fd6b8d2b261aa57797e7c9e2ce6b1d9fb5fe8 100644 (file)
--- a/ircd/s_user.c
+++ b/ircd/s_user.c
@@ -66,7 +66,7 @@
 
 #include "handlers.h" /* m_motd and m_lusers */
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/ircd/send.c b/ircd/send.c
index 54c38a84ba8e213bee51fa7d1640c698461d6de6..4dc21eaec3cbc14f9befb3ce7cc8d37999abf6c5 100644 (file)
--- a/ircd/send.c
+++ b/ircd/send.c
@@ -29,6 +29,7 @@
 #include "client.h"
 #include "ircd.h"
 #include "ircd_features.h"
+#include "ircd_log.h"
 #include "ircd_snprintf.h"
 #include "ircd_string.h"
 #include "list.h"
@@ -43,7 +44,7 @@
 #include "struct.h"
 #include "sys.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <stdio.h>
 #include <string.h>
 

diff --git a/ircd/test/ircd_chattr_t.c b/ircd/test/ircd_chattr_t.c
index 806a3e62e47608f056b7809987faa1228351cc3e..04051e27c23f5fa6d8d957657859552c7dd3e29a 100644 (file)
--- a/ircd/test/ircd_chattr_t.c
+++ b/ircd/test/ircd_chattr_t.c
@@ -2,7 +2,7 @@
  * ircd_chattr_t.c - Test file for character attributes
  */
 #include "ircd_chattr.h"
-#include <assert.h>
+/* #include <assert.h> -- not used here */
 #include <stdio.h>
 
 typedef int (*EvalFn)(char);

diff --git a/ircd/umkpasswd.c b/ircd/umkpasswd.c
index 29a2bea29118655be4449688f19f9b225fffe596..aa2f7f63f49d0798092d7ac5c3df9babee4d7bcd 100644 (file)
--- a/ircd/umkpasswd.c
+++ b/ircd/umkpasswd.c
@@ -26,10 +26,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 
 /* ircu headers */
 #include "ircd_alloc.h"
+#include "ircd_log.h" /* for ircd's assert.h */
 #include "ircd_string.h"
 #include "umkpasswd.h"
 #include "s_debug.h"
@@ -44,6 +45,7 @@
 /* bleah, evil globals */
 umkpasswd_conf_t* umkpasswd_conf;
 crypt_mechs_t* crypt_mechs_root;
+int log_inassert = 0;
 
 void copyright(void)
 {
@@ -94,6 +96,17 @@ int err = errno;
   errno = err;
 }
 
+/* quick implementation of log_write() for assert() call */
+void log_write(enum LogSys subsys, enum LogLevel severity,
+              unsigned int flags, const char *fmt, ...)
+{
+  va_list vl;
+  va_start(vl, fmt);
+  vfprintf(stderr, fmt, vl);
+  fprintf(stderr, "\n");
+  va_end(vl);
+}
+
 /* quick and dirty salt generator */
 char *make_salt(const char *salts)
 {

diff --git a/ircd/uping.c b/ircd/uping.c
index 3342c8a26194648e9b496f0807fdb31f9b8849b8..c2d70ab857b4c4232403bbc1944852062185ac96 100644 (file)
--- a/ircd/uping.c
+++ b/ircd/uping.c
@@ -43,7 +43,7 @@
 #include "sys.h"
 
 #include <arpa/inet.h>
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <errno.h>
 #include <netdb.h>
 #include <stdio.h>

diff --git a/ircd/whowas.c b/ircd/whowas.c
index b8fc1734eb3fd4cf91b36f9f44c868d7b9702165..4546b5710a1f7f14798caebd58aad8d9efb3e53b 100644 (file)
--- a/ircd/whowas.c
+++ b/ircd/whowas.c
@@ -40,6 +40,7 @@
 #include "ircd_alloc.h"
 #include "ircd_chattr.h"
 #include "ircd_features.h"
+#include "ircd_log.h"
 #include "ircd_string.h"
 #include "list.h"
 #include "numeric.h"
@@ -51,7 +52,7 @@
 #include "sys.h"
 #include "msg.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <stdlib.h>
 #include <string.h>