Module: ngircd.git Branch: master Commit: 51ed74205432036f729d96bf5683ca858aae9f10 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=51ed7...

Author: Alexander Barton alex@barton.de Date: Sat May 22 17:10:22 2010 +0200

Refactor Wall_ServerNotice() into more generic Log_ServerNotice()

Log_ServerNotice() sends a messages to all users having a given user mode set.

---

src/ngircd/log.c | 46 ++++++++++++++++++++++++++++++---------------- src/ngircd/log.h | 7 +++---- 2 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/src/ngircd/log.c b/src/ngircd/log.c index ff81163..439ca41 100644 --- 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 @@ -50,8 +50,6 @@ static char Error_File[FNAME_LEN]; #endif

-static void Wall_ServerNotice PARAMS(( char *Msg )); - static void Log_Message(int Level, const char *msg) { @@ -260,7 +258,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 +326,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- */ diff --git a/src/ngircd/log.h b/src/ngircd/log.h index 529b164..e7e6b61 100644 --- a/src/ngircd/log.h +++ b/src/ngircd/log.h @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001,2002 by 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 @@ -8,8 +8,6 @@ * (at your option) any later version. * Please read the file COPYING, README and AUTHORS for more information. * - * $Id: log.h,v 1.20 2006/08/05 09:16:21 fw Exp $ - * * Logging functions (header) */

@@ -40,13 +38,14 @@ GLOBAL void Log_Exit PARAMS(( void ));

GLOBAL void Log PARAMS(( int Level, const char *Format, ... ));

+GLOBAL void Log_ServerNotice PARAMS((char UserMode, const char *Format, ...)); + #ifdef DEBUG GLOBAL void LogDebug PARAMS(( const char *Format, ... )); #else static inline void LogDebug PARAMS(( UNUSED const char *Format, ... )){/* Do nothing. The compiler should optimize this out, please ;-) */} #endif

- GLOBAL void Log_Init_Resolver PARAMS(( void )); GLOBAL void Log_Exit_Resolver PARAMS(( void ));