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

-Whitespace Damage; Client_OperCount(), Client_UnknownCount(), Client_MyServerCount() return unsigned long

This commit is contained in:
Florian Westphal 2006-10-07 10:40:52 +00:00
parent 6e105bf87e
commit 018e351630
4 changed files with 44 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/ngircd/client.c
View File

@ -17,7 +17,7 @@
#include "portab.h" #include "portab.h"
static char UNUSED id[] = "$Id: client.c,v 1.92 2006/10/06 19:57:56 fw Exp $"; static char UNUSED id[] = "$Id: client.c,v 1.93 2006/10/07 10:40:52 fw Exp $";
#include "imp.h" #include "imp.h"
#include <assert.h> #include <assert.h>
@ -57,8 +57,8 @@ static WHOWAS My_Whowas[MAX_WHOWAS];
static int Last_Whowas = -1; static int Last_Whowas = -1;
static long Count PARAMS(( CLIENT_TYPE Type )); static unsigned long Count PARAMS(( CLIENT_TYPE Type ));
static long MyCount PARAMS(( CLIENT_TYPE Type )); static unsigned long MyCount PARAMS(( CLIENT_TYPE Type ));
static CLIENT *New_Client_Struct PARAMS(( void )); static CLIENT *New_Client_Struct PARAMS(( void ));
static void Generate_MyToken PARAMS(( CLIENT *Client )); static void Generate_MyToken PARAMS(( CLIENT *Client ));
@ -211,8 +211,8 @@ Init_New_Client(CONN_ID Idx, CLIENT *Introducer, CLIENT *TopServer,
if( Modes ) Client_SetModes( client, Modes ); if( Modes ) Client_SetModes( client, Modes );
if( Type == CLIENT_SERVER ) Generate_MyToken( client ); if( Type == CLIENT_SERVER ) Generate_MyToken( client );
/* ist der User away? */ if( strchr( client->modes, 'a' ))
if( strchr( client->modes, 'a' )) strlcpy( client->away, DEFAULT_AWAY_MSG, sizeof( client->away )); strlcpy( client->away, DEFAULT_AWAY_MSG, sizeof( client->away ));
/* Verketten */ /* Verketten */
client->next = (POINTER *)My_Clients; client->next = (POINTER *)My_Clients;
@ -399,7 +399,7 @@ Client_SetUser( CLIENT *Client, char *User, bool Idented )
assert( Client != NULL ); assert( Client != NULL );
assert( User != NULL ); assert( User != NULL );
if( Idented ) strlcpy( Client->user, User, sizeof( Client->user )); if( Idented ) strlcpy( Client->user, User, sizeof( Client->user ));
else else
{ {
@ -416,7 +416,7 @@ Client_SetInfo( CLIENT *Client, char *Info )
assert( Client != NULL ); assert( Client != NULL );
assert( Info != NULL ); assert( Info != NULL );
strlcpy( Client->info, Info, sizeof( Client->info )); strlcpy( Client->info, Info, sizeof( Client->info ));
} /* Client_SetInfo */ } /* Client_SetInfo */
@ -452,7 +452,7 @@ Client_SetPassword( CLIENT *Client, char *Pwd )
assert( Client != NULL ); assert( Client != NULL );
assert( Pwd != NULL ); assert( Pwd != NULL );
strlcpy( Client->pwd, Pwd, sizeof( Client->pwd )); strlcpy( Client->pwd, Pwd, sizeof( Client->pwd ));
} /* Client_SetPassword */ } /* Client_SetPassword */
@ -522,7 +522,7 @@ Client_ModeAdd( CLIENT *Client, char Mode )
*/ */
char x[2]; char x[2];
assert( Client != NULL ); assert( Client != NULL );
x[0] = Mode; x[1] = '\0'; x[0] = Mode; x[1] = '\0';
@ -734,11 +734,13 @@ GLOBAL CLIENT *
Client_NextHop( CLIENT *Client ) Client_NextHop( CLIENT *Client )
{ {
CLIENT *c; CLIENT *c;
assert( Client != NULL ); assert( Client != NULL );
c = Client; c = Client;
while( c->introducer && ( c->introducer != c ) && ( c->introducer != This_Server )) c = c->introducer; while( c->introducer && ( c->introducer != c ) && ( c->introducer != This_Server ))
c = c->introducer;
return c; return c;
} /* Client_NextHop */ } /* Client_NextHop */
@ -750,7 +752,7 @@ Client_Mask( CLIENT *Client )
* Prefixe benoetigt wird. */ * Prefixe benoetigt wird. */
assert( Client != NULL ); assert( Client != NULL );
if( Client->type == CLIENT_SERVER ) return Client->id; if( Client->type == CLIENT_SERVER ) return Client->id;
snprintf( GetID_Buffer, GETID_LEN, "%s!%s@%s", Client->id, Client->user, Client->host ); snprintf( GetID_Buffer, GETID_LEN, "%s!%s@%s", Client->id, Client->user, Client->host );
@ -795,12 +797,9 @@ Client_Away( CLIENT *Client )
GLOBAL bool GLOBAL bool
Client_CheckNick( CLIENT *Client, char *Nick ) Client_CheckNick( CLIENT *Client, char *Nick )
{ {
/* Nick ueberpruefen */
assert( Client != NULL ); assert( Client != NULL );
assert( Nick != NULL ); assert( Nick != NULL );
/* Nick ungueltig? */
if( ! Client_IsValidNick( Nick )) if( ! Client_IsValidNick( Nick ))
{ {
IRC_WriteStrClient( Client, ERR_ERRONEUSNICKNAME_MSG, Client_ID( Client ), Nick ); IRC_WriteStrClient( Client, ERR_ERRONEUSNICKNAME_MSG, Client_ID( Client ), Nick );
@ -913,11 +912,11 @@ Client_MyServiceCount( void )
} /* Client_MyServiceCount */ } /* Client_MyServiceCount */
GLOBAL long GLOBAL unsigned long
Client_MyServerCount( void ) Client_MyServerCount( void )
{ {
CLIENT *c; CLIENT *c;
long cnt; unsigned long cnt;
cnt = 0; cnt = 0;
c = My_Clients; c = My_Clients;
@ -930,11 +929,11 @@ Client_MyServerCount( void )
} /* Client_MyServerCount */ } /* Client_MyServerCount */
GLOBAL long GLOBAL unsigned long
Client_OperCount( void ) Client_OperCount( void )
{ {
CLIENT *c; CLIENT *c;
long cnt; unsigned long cnt;
cnt = 0; cnt = 0;
c = My_Clients; c = My_Clients;
@ -947,19 +946,19 @@ Client_OperCount( void )
} /* Client_OperCount */ } /* Client_OperCount */
GLOBAL long GLOBAL unsigned long
Client_UnknownCount( void ) Client_UnknownCount( void )
{ {
CLIENT *c; CLIENT *c;
long cnt; unsigned long cnt = 0;
cnt = 0;
c = My_Clients; c = My_Clients;
while( c ) while( c )
{ {
if( c && ( c->type != CLIENT_USER ) && ( c->type != CLIENT_SERVICE ) && ( c->type != CLIENT_SERVER )) cnt++; if( c && ( c->type != CLIENT_USER ) && ( c->type != CLIENT_SERVICE ) && ( c->type != CLIENT_SERVER )) cnt++;
c = (CLIENT *)c->next; c = (CLIENT *)c->next;
} }
return cnt; return cnt;
} /* Client_UnknownCount */ } /* Client_UnknownCount */
@ -1034,13 +1033,12 @@ Client_StartTime(CLIENT *Client)
} /* Client_Uptime */ } /* Client_Uptime */
static long static unsigned long
Count( CLIENT_TYPE Type ) Count( CLIENT_TYPE Type )
{ {
CLIENT *c; CLIENT *c;
long cnt; unsigned long cnt = 0;
cnt = 0;
c = My_Clients; c = My_Clients;
while( c ) while( c )
{ {
@ -1051,13 +1049,12 @@ Count( CLIENT_TYPE Type )
} /* Count */ } /* Count */
static long static unsigned long
MyCount( CLIENT_TYPE Type ) MyCount( CLIENT_TYPE Type )
{ {
CLIENT *c; CLIENT *c;
long cnt; unsigned long cnt = 0;
cnt = 0;
c = My_Clients; c = My_Clients;
while( c ) while( c )
{ {
@ -1072,9 +1069,9 @@ static CLIENT *
New_Client_Struct( void ) New_Client_Struct( void )
{ {
/* Neue CLIENT-Struktur pre-initialisieren */ /* Neue CLIENT-Struktur pre-initialisieren */
CLIENT *c; CLIENT *c;
c = (CLIENT *)malloc( sizeof( CLIENT )); c = (CLIENT *)malloc( sizeof( CLIENT ));
if( ! c ) if( ! c )
{ {
@ -1127,7 +1124,7 @@ Adjust_Counters( CLIENT *Client )
assert( Client != NULL ); assert( Client != NULL );
if( Client->type != CLIENT_USER ) return; if( Client->type != CLIENT_USER ) return;
if( Client->conn_id != NONE ) if( Client->conn_id != NONE )
{ {
/* Local connection */ /* Local connection */
@ -1150,7 +1147,7 @@ Client_RegisterWhowas( CLIENT *Client )
{ {
int slot; int slot;
time_t now; time_t now;
assert( Client != NULL ); assert( Client != NULL );
now = time(NULL); now = time(NULL);
@ -1164,7 +1161,7 @@ Client_RegisterWhowas( CLIENT *Client )
#ifdef DEBUG #ifdef DEBUG
Log( LOG_DEBUG, "Saving WHOWAS information to slot %d ...", slot ); Log( LOG_DEBUG, "Saving WHOWAS information to slot %d ...", slot );
#endif #endif
My_Whowas[slot].time = now; My_Whowas[slot].time = now;
strlcpy( My_Whowas[slot].id, Client_ID( Client ), strlcpy( My_Whowas[slot].id, Client_ID( Client ),
sizeof( My_Whowas[slot].id )); sizeof( My_Whowas[slot].id ));
@ -1176,7 +1173,7 @@ Client_RegisterWhowas( CLIENT *Client )
sizeof( My_Whowas[slot].info )); sizeof( My_Whowas[slot].info ));
strlcpy( My_Whowas[slot].server, Client_ID( Client_Introducer( Client )), strlcpy( My_Whowas[slot].server, Client_ID( Client_Introducer( Client )),
sizeof( My_Whowas[slot].server )); sizeof( My_Whowas[slot].server ));
Last_Whowas = slot; Last_Whowas = slot;
} /* Client_RegisterWhowas */ } /* Client_RegisterWhowas */

8
src/ngircd/client.h
View File

@ -8,7 +8,7 @@
* (at your option) any later version. * (at your option) any later version.
* Please read the file COPYING, README and AUTHORS for more information. * Please read the file COPYING, README and AUTHORS for more information.
* *
* $Id: client.h,v 1.44 2006/10/06 19:57:56 fw Exp $ * $Id: client.h,v 1.45 2006/10/07 10:40:52 fw Exp $
* *
* Client management (header) * Client management (header)
*/ */
@ -137,11 +137,11 @@ GLOBAL bool Client_CheckID PARAMS(( CLIENT *Client, char *ID ));
GLOBAL long Client_UserCount PARAMS(( void )); GLOBAL long Client_UserCount PARAMS(( void ));
GLOBAL long Client_ServiceCount PARAMS(( void )); GLOBAL long Client_ServiceCount PARAMS(( void ));
GLOBAL long Client_ServerCount PARAMS(( void )); GLOBAL long Client_ServerCount PARAMS(( void ));
GLOBAL long Client_OperCount PARAMS(( void )); GLOBAL unsigned long Client_OperCount PARAMS(( void ));
GLOBAL long Client_UnknownCount PARAMS(( void )); GLOBAL unsigned long Client_UnknownCount PARAMS(( void ));
GLOBAL long Client_MyUserCount PARAMS(( void )); GLOBAL long Client_MyUserCount PARAMS(( void ));
GLOBAL long Client_MyServiceCount PARAMS(( void )); GLOBAL long Client_MyServiceCount PARAMS(( void ));
GLOBAL long Client_MyServerCount PARAMS(( void )); GLOBAL unsigned long Client_MyServerCount PARAMS(( void ));
GLOBAL long Client_MaxUserCount PARAMS(( void )); GLOBAL long Client_MaxUserCount PARAMS(( void ));
GLOBAL long Client_MyMaxUserCount PARAMS(( void )); GLOBAL long Client_MyMaxUserCount PARAMS(( void ));

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

@ -14,7 +14,7 @@
#include "portab.h" #include "portab.h"
static char UNUSED id[] = "$Id: irc-info.c,v 1.36 2006/10/06 21:32:58 fw Exp $"; static char UNUSED id[] = "$Id: irc-info.c,v 1.37 2006/10/07 10:40:52 fw Exp $";
#include "imp.h" #include "imp.h"
#include <assert.h> #include <assert.h>
@ -833,9 +833,9 @@ IRC_WHOWAS( CLIENT *Client, REQUEST *Req )
GLOBAL bool GLOBAL bool
IRC_Send_LUSERS( CLIENT *Client ) IRC_Send_LUSERS( CLIENT *Client )
{ {
long cnt; unsigned long cnt;
#ifndef STRICT_RFC #ifndef STRICT_RFC
long max; unsigned long max;
#endif #endif
assert( Client != NULL ); assert( Client != NULL );

10
src/ngircd/messages.h
View File

@ -8,7 +8,7 @@
* (at your option) any later version. * (at your option) any later version.
* Please read the file COPYING, README and AUTHORS for more information. * Please read the file COPYING, README and AUTHORS for more information.
* *
* $Id: messages.h,v 1.70 2006/10/06 21:32:58 fw Exp $ * $Id: messages.h,v 1.71 2006/10/07 10:40:52 fw Exp $
* *
* IRC numerics (Header) * IRC numerics (Header)
*/ */
@ -33,17 +33,17 @@
#define RPL_ENDOFSTATS_MSG "219 %s %c :End of STATS report" #define RPL_ENDOFSTATS_MSG "219 %s %c :End of STATS report"
#define RPL_UMODEIS_MSG "221 %s +%s" #define RPL_UMODEIS_MSG "221 %s +%s"
#define RPL_LUSERCLIENT_MSG "251 %s :There are %ld users and %ld services on %ld servers" #define RPL_LUSERCLIENT_MSG "251 %s :There are %ld users and %ld services on %ld servers"
#define RPL_LUSEROP_MSG "252 %s %ld :operator(s) online" #define RPL_LUSEROP_MSG "252 %s %lu :operator(s) online"
#define RPL_LUSERUNKNOWN_MSG "253 %s %ld :unknown connection(s)" #define RPL_LUSERUNKNOWN_MSG "253 %s %lu :unknown connection(s)"
#define RPL_LUSERCHANNELS_MSG "254 %s %lu :channels formed" #define RPL_LUSERCHANNELS_MSG "254 %s %lu :channels formed"
#define RPL_LUSERME_MSG "255 %s :I have %ld users, %ld services and %ld servers" #define RPL_LUSERME_MSG "255 %s :I have %lu users, %lu services and %lu servers"
#define RPL_ADMINME_MSG "256 %s %s :Administrative info" #define RPL_ADMINME_MSG "256 %s %s :Administrative info"
#define RPL_ADMINLOC1_MSG "257 %s :%s" #define RPL_ADMINLOC1_MSG "257 %s :%s"
#define RPL_ADMINLOC2_MSG "258 %s :%s" #define RPL_ADMINLOC2_MSG "258 %s :%s"
#define RPL_ADMINEMAIL_MSG "259 %s :%s" #define RPL_ADMINEMAIL_MSG "259 %s :%s"
#define RPL_TRACEEND_MSG "262 %s %s %s-%s.%s :End of TRACE" #define RPL_TRACEEND_MSG "262 %s %s %s-%s.%s :End of TRACE"
#define RPL_LOCALUSERS_MSG "265 %s %ld %ld :Current local users: %ld, Max: %ld" #define RPL_LOCALUSERS_MSG "265 %s %ld %ld :Current local users: %ld, Max: %ld"
#define RPL_NETUSERS_MSG "266 %s %ld %ld :Current global users: %ld, Max: %ld" #define RPL_NETUSERS_MSG "266 %s %lu %lu :Current global users: %lu, Max: %lu"
#define RPL_AWAY_MSG "301 %s %s :%s" #define RPL_AWAY_MSG "301 %s %s :%s"
#define RPL_USERHOST_MSG "302 %s :" #define RPL_USERHOST_MSG "302 %s :"