albino
/
ngircd-tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove unneeded LOG_DEBUG when not compiling with DEBUG support 

when ngircd is build without DEBUG enabled, LOG_DEBUG messages
are always discarded.

To avoid the extra code, ngircd has a LogDebug() wrapper which
gets removed by the compiler when compiling without DEBUG defined.

Update a few functings which were using the
Log(LOG_DEBUG, .. interface directly without #ifdef DEBUG guards.

   text	   data	    bss	    dec	    hex	filename
 127748	   1900	  28280	 157928	  268e8	ngircd.before
 126836	   1896	  28280	 157012	  26554	ngircd.after
This commit is contained in:
Florian Westphal 2009-01-10 00:44:34 +01:00
parent 0acef7c598
commit 1c7b9dbe93
7 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ngircd/channel.c
View File

@ -876,7 +876,7 @@ Add_Client( CHANNEL *Chan, CLIENT *Client )
cl2chan->next = My_Cl2Chan; cl2chan->next = My_Cl2Chan;
My_Cl2Chan = cl2chan; My_Cl2Chan = cl2chan;
Log( LOG_DEBUG, "User \"%s\" joined channel \"%s\".", Client_Mask( Client ), Chan->name ); LogDebug("User \"%s\" joined channel \"%s\".", Client_Mask(Client), Chan->name);
return cl2chan; return cl2chan;
} /* Add_Client */ } /* Add_Client */

2
src/ngircd/client.c
View File

@ -1047,7 +1047,7 @@ Generate_MyToken( CLIENT *Client )
else c = (CLIENT *)c->next; else c = (CLIENT *)c->next;
} }
Client->mytoken = token; Client->mytoken = token;
Log( LOG_DEBUG, "Assigned token %d to server \"%s\".", token, Client->id ); LogDebug("Assigned token %d to server \"%s\".", token, Client->id);
} /* Generate_MyToken */ } /* Generate_MyToken */

6
src/ngircd/irc-login.c
View File

@ -242,7 +242,7 @@ IRC_NICK( CLIENT *Client, REQUEST *Req )
Client_Type(target) != CLIENT_SERVICE && Client_Type(target) != CLIENT_SERVICE &&
Client_Type(target) != CLIENT_SERVER) { Client_Type(target) != CLIENT_SERVER) {
/* New client */ /* New client */
Log( LOG_DEBUG, "Connection %d: got valid NICK command ...", LogDebug("Connection %d: got valid NICK command ...",
Client_Conn( Client )); Client_Conn( Client ));
/* Register new nickname of this client */ /* Register new nickname of this client */
@ -723,7 +723,7 @@ IRC_PONG(CLIENT *Client, REQUEST *Req)
/* The connection timestamp has already been updated when the data has /* The connection timestamp has already been updated when the data has
* been read from so socket, so we don't need to update it here. */ * been read from so socket, so we don't need to update it here. */
#ifdef DEBUG
if (Client_Conn(Client) > NONE) if (Client_Conn(Client) > NONE)
Log(LOG_DEBUG, Log(LOG_DEBUG,
"Connection %d: received PONG. Lag: %ld seconds.", "Connection %d: received PONG. Lag: %ld seconds.",
@ -732,7 +732,7 @@ IRC_PONG(CLIENT *Client, REQUEST *Req)
else else
Log(LOG_DEBUG, Log(LOG_DEBUG,
"Connection %d: received PONG.", Client_Conn(Client)); "Connection %d: received PONG.", Client_Conn(Client));
#endif
return CONNECTED; return CONNECTED;
} /* IRC_PONG */ } /* IRC_PONG */

4
src/ngircd/irc-mode.c
View File

@ -531,7 +531,7 @@ Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel )
strlcat(the_args, " ", sizeof(the_args)); strlcat(the_args, " ", sizeof(the_args));
strlcat(the_args, Client_ID(client), sizeof(the_args)); strlcat(the_args, Client_ID(client), sizeof(the_args));
strlcat(the_modes, x, sizeof(the_modes)); strlcat(the_modes, x, sizeof(the_modes));
Log(LOG_DEBUG, "User \"%s\": Mode change on %s, now \"%s\"", LogDebug("User \"%s\": Mode change on %s, now \"%s\"",
Client_Mask(client), Channel_Name(Channel), Channel_UserModes(Channel, client)); Client_Mask(client), Channel_Name(Channel), Channel_UserModes(Channel, client));
} }
} else { } else {
@ -539,7 +539,7 @@ Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel )
retval = set ? Channel_ModeAdd(Channel, x[0]) : Channel_ModeDel(Channel, x[0]); retval = set ? Channel_ModeAdd(Channel, x[0]) : Channel_ModeDel(Channel, x[0]);
if (retval) { if (retval) {
strlcat(the_modes, x, sizeof(the_modes)); strlcat(the_modes, x, sizeof(the_modes));
Log(LOG_DEBUG, "Channel %s: Mode change, now \"%s\".", Channel_Name(Channel), Channel_Modes(Channel)); LogDebug("Channel %s: Mode change, now \"%s\".", Channel_Name(Channel), Channel_Modes(Channel));
} }
} }

2
src/ngircd/ngircd.c
View File

@ -316,7 +316,7 @@ main( int argc, const char *argv[] )
#ifdef ZLIB #ifdef ZLIB
strlcat( NGIRCd_ProtoID, "Z", sizeof NGIRCd_ProtoID ); strlcat( NGIRCd_ProtoID, "Z", sizeof NGIRCd_ProtoID );
#endif #endif
Log( LOG_DEBUG, "Protocol and server ID is \"%s\".", NGIRCd_ProtoID ); LogDebug("Protocol and server ID is \"%s\".", NGIRCd_ProtoID);
/* Vordefinierte Channels anlegen */ /* Vordefinierte Channels anlegen */
Channel_InitPredefined( ); Channel_InitPredefined( );

2
src/ngircd/parse.c
View File

@ -180,7 +180,7 @@ Parse_Request( CONN_ID Idx, char *Request )
ptr = strchr( Request, ' ' ); ptr = strchr( Request, ' ' );
if( ! ptr ) if( ! ptr )
{ {
Log( LOG_DEBUG, "Connection %d: Parse error: prefix without command!?", Idx ); LogDebug("Connection %d: Parse error: prefix without command!?", Idx);
return Conn_WriteStr( Idx, "ERROR :Prefix without command!?" ); return Conn_WriteStr( Idx, "ERROR :Prefix without command!?" );
} }
*ptr = '\0'; *ptr = '\0';

4
src/ngircd/resolve.c
View File

@ -14,8 +14,6 @@
#include "portab.h" #include "portab.h"
static char UNUSED id[] = "$Id: resolve.c,v 1.29 2008/02/26 22:04:17 fw Exp $";
#include "imp.h" #include "imp.h"
#include <assert.h> #include <assert.h>
#include <errno.h> #include <errno.h>
@ -92,7 +90,7 @@ Resolve_Addr(RES_STAT * s, const ng_ipaddr_t *Addr, int identsock,
pid = Resolver_fork(pipefd); pid = Resolver_fork(pipefd);
if (pid > 0) { if (pid > 0) {
Log(LOG_DEBUG, "Resolver for %s created (PID %d).", ng_ipaddr_tostr(Addr), pid); LogDebug("Resolver for %s created (PID %d).", ng_ipaddr_tostr(Addr), pid);
s->pid = pid; s->pid = pid;
s->resolver_fd = pipefd[0]; s->resolver_fd = pipefd[0];