Don't #include client.h when conn.h/conn-func.h is already included

[ngircd.git] / src / ngircd / log.c

diff --git a/src/ngircd/log.c b/src/ngircd/log.c
index 5a81b5b3e03083451d65150b033e04ce4d873151..f81c308ff8cc5f401c06511a6aaa90a42e545fc4 100644 (file)
--- a/src/ngircd/log.c
+++ b/src/ngircd/log.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2005 Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2010 Alexander Barton (alex@barton.de)
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -34,7 +34,6 @@
 #include "ngircd.h"
 #include "defines.h"
 #include "conn.h"
-#include "client.h"
 #include "channel.h"
 #include "irc-write.h"
 
@@ -50,8 +49,6 @@ static char Error_File[FNAME_LEN];
 #endif
 
 
-static void Wall_ServerNotice PARAMS(( char *Msg ));
-
 static void
 Log_Message(int Level, const char *msg)
 {
@@ -146,8 +143,8 @@ GLOBAL void
 Log_Exit( void )
 {
        /* Good Bye! */
-       if( NGIRCd_SignalRestart ) Log( LOG_NOTICE, "%s done (restarting).", PACKAGE_NAME );
-       else Log( LOG_NOTICE, "%s done.", PACKAGE_NAME );
+       Log(LOG_NOTICE, "%s done%s, served %lu connections.", PACKAGE_NAME,
+           NGIRCd_SignalRestart ? " (restarting)" : "", Conn_CountAccepted());
 
 #ifdef DEBUG
        if( Error_File[0] )
@@ -260,7 +257,7 @@ va_dcl
        if (snotice) {
                /* Send NOTICE to all local users with mode +s and to the
                 * local &SERVER channel */
-               Wall_ServerNotice(msg);
+               Log_ServerNotice('s', "%s", msg);
                Channel_LogServer(msg);
        }
 } /* Log */
@@ -328,25 +325,41 @@ va_dcl
 
 
 /**
- * Send log messages to users flagged with the "s" mode.
- * @param Msg The message to send.
+ * Send a log message to all local users flagged with the given user mode.
+ * @param UserMode User mode which the target user must have set,
+ * @param Format The format string.
  */
-static void
-Wall_ServerNotice( char *Msg )
+#ifdef PROTOTYPES
+GLOBAL void
+Log_ServerNotice(const char UserMode, const char *Format, ... )
+#else
+GLOBAL void
+Log_ServerNotice(UserMode, Format, va_alist)
+const char UserMode;
+const char *Format;
+va_dcl
+#endif
 {
        CLIENT *c;
+       char msg[MAX_LOG_MSG_LEN];
+       va_list ap;
 
-       assert( Msg != NULL );
+       assert(Format != NULL);
 
-       c = Client_First( );
-       while(c) {
-               if (Client_Conn(c) > NONE && Client_HasMode(c, 's'))
-                       IRC_WriteStrClient(c, "NOTICE %s :%s%s", Client_ID(c),
-                                                       NOTICE_TXTPREFIX, Msg);
+#ifdef PROTOTYPES
+       va_start(ap, Format);
+#else
+       va_start(ap);
+#endif
+       vsnprintf(msg, MAX_LOG_MSG_LEN, Format, ap);
+       va_end(ap);
 
-               c = Client_Next( c );
+       for(c=Client_First(); c != NULL; c=Client_Next(c)) {
+               if (Client_Conn(c) > NONE && Client_HasMode(c, UserMode))
+                       IRC_WriteStrClient(c, "NOTICE %s :%s%s", Client_ID(c),
+                                                       NOTICE_TXTPREFIX, msg);
        }
-} /* Wall_ServerNotice */
+} /* Log_ServerNotice */
 
 
 /* -eof- */