Commit Diff
Diff:
6e105bf87ee5008f32b7557eea2977deb8d10a71
018e3516303dacbf6aaf277fd0104e13bc9c8455
Commit:
018e3516303dacbf6aaf277fd0104e13bc9c8455
Tree:
4311dba5d570354d3b4bd7a78a9caf2b1b5bdc41
Author:
Florian Westphal <fw@strlen.de>
Committer:
Florian Westphal <fw@strlen.de>
Date:
Sat Oct 7 10:40:52 2006 UTC
Message:
-Whitespace Damage; Client_OperCount(), Client_UnknownCount(), Client_MyServerCount() return unsigned long
blob - ec3c6ce7c44d78e1c0b9c0b8336ef91915db5acc
blob + 6c4edd193160e7e18a72df04a2a7ae1cdc573dc6
--- src/ngircd/client.c
+++ src/ngircd/client.c
@@ -17,7 +17,7 @@
#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 <assert.h>
@@ -57,8 +57,8 @@ static WHOWAS My_Whowas[MAX_WHOWAS];
static int Last_Whowas = -1;
-static long Count PARAMS(( CLIENT_TYPE Type ));
-static long MyCount PARAMS(( CLIENT_TYPE Type ));
+static unsigned long Count PARAMS(( CLIENT_TYPE Type ));
+static unsigned long MyCount PARAMS(( CLIENT_TYPE Type ));
static CLIENT *New_Client_Struct PARAMS(( void ));
static void Generate_MyToken PARAMS(( CLIENT *Client ));
@@ -211,8 +211,8 @@ Init_New_Client(CONN_ID Idx, CLIENT *Introducer, CLIEN
if( Modes ) Client_SetModes( client, Modes );
if( Type == CLIENT_SERVER ) Generate_MyToken( client );
- /* ist der User away? */
- if( strchr( client->modes, 'a' )) strlcpy( client->away, DEFAULT_AWAY_MSG, sizeof( client->away ));
+ if( strchr( client->modes, 'a' ))
+ strlcpy( client->away, DEFAULT_AWAY_MSG, sizeof( client->away ));
/* Verketten */
client->next = (POINTER *)My_Clients;
@@ -399,7 +399,7 @@ Client_SetUser( CLIENT *Client, char *User, bool Ident
assert( Client != NULL );
assert( User != NULL );
-
+
if( Idented ) strlcpy( Client->user, User, sizeof( Client->user ));
else
{
@@ -416,7 +416,7 @@ Client_SetInfo( CLIENT *Client, char *Info )
assert( Client != NULL );
assert( Info != NULL );
-
+
strlcpy( Client->info, Info, sizeof( Client->info ));
} /* Client_SetInfo */
@@ -452,7 +452,7 @@ Client_SetPassword( CLIENT *Client, char *Pwd )
assert( Client != NULL );
assert( Pwd != NULL );
-
+
strlcpy( Client->pwd, Pwd, sizeof( Client->pwd ));
} /* Client_SetPassword */
@@ -522,7 +522,7 @@ Client_ModeAdd( CLIENT *Client, char Mode )
*/
char x[2];
-
+
assert( Client != NULL );
x[0] = Mode; x[1] = '\0';
@@ -734,11 +734,13 @@ GLOBAL CLIENT *
Client_NextHop( CLIENT *Client )
{
CLIENT *c;
-
+
assert( Client != NULL );
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;
} /* Client_NextHop */
@@ -750,7 +752,7 @@ Client_Mask( CLIENT *Client )
* Prefixe benoetigt wird. */
assert( Client != NULL );
-
+
if( Client->type == CLIENT_SERVER ) return Client->id;
snprintf( GetID_Buffer, GETID_LEN, "%s!%s@%s", Client->id, Client->user, Client->host );
@@ -795,12 +797,9 @@ Client_Away( CLIENT *Client )
GLOBAL bool
Client_CheckNick( CLIENT *Client, char *Nick )
{
- /* Nick ueberpruefen */
-
assert( Client != NULL );
assert( Nick != NULL );
-
- /* Nick ungueltig? */
+
if( ! Client_IsValidNick( Nick ))
{
IRC_WriteStrClient( Client, ERR_ERRONEUSNICKNAME_MSG, Client_ID( Client ), Nick );
@@ -913,11 +912,11 @@ Client_MyServiceCount( void )
} /* Client_MyServiceCount */
-GLOBAL long
+GLOBAL unsigned long
Client_MyServerCount( void )
{
CLIENT *c;
- long cnt;
+ unsigned long cnt;
cnt = 0;
c = My_Clients;
@@ -930,11 +929,11 @@ Client_MyServerCount( void )
} /* Client_MyServerCount */
-GLOBAL long
+GLOBAL unsigned long
Client_OperCount( void )
{
CLIENT *c;
- long cnt;
+ unsigned long cnt;
cnt = 0;
c = My_Clients;
@@ -947,19 +946,19 @@ Client_OperCount( void )
} /* Client_OperCount */
-GLOBAL long
+GLOBAL unsigned long
Client_UnknownCount( void )
{
CLIENT *c;
- long cnt;
+ unsigned long cnt = 0;
- cnt = 0;
c = My_Clients;
while( c )
{
if( c && ( c->type != CLIENT_USER ) && ( c->type != CLIENT_SERVICE ) && ( c->type != CLIENT_SERVER )) cnt++;
c = (CLIENT *)c->next;
}
+
return cnt;
} /* Client_UnknownCount */
@@ -1034,13 +1033,12 @@ Client_StartTime(CLIENT *Client)
} /* Client_Uptime */
-static long
+static unsigned long
Count( CLIENT_TYPE Type )
{
CLIENT *c;
- long cnt;
+ unsigned long cnt = 0;
- cnt = 0;
c = My_Clients;
while( c )
{
@@ -1051,13 +1049,12 @@ Count( CLIENT_TYPE Type )
} /* Count */
-static long
+static unsigned long
MyCount( CLIENT_TYPE Type )
{
CLIENT *c;
- long cnt;
+ unsigned long cnt = 0;
- cnt = 0;
c = My_Clients;
while( c )
{
@@ -1072,9 +1069,9 @@ static CLIENT *
New_Client_Struct( void )
{
/* Neue CLIENT-Struktur pre-initialisieren */
-
+
CLIENT *c;
-
+
c = (CLIENT *)malloc( sizeof( CLIENT ));
if( ! c )
{
@@ -1127,7 +1124,7 @@ Adjust_Counters( CLIENT *Client )
assert( Client != NULL );
if( Client->type != CLIENT_USER ) return;
-
+
if( Client->conn_id != NONE )
{
/* Local connection */
@@ -1150,7 +1147,7 @@ Client_RegisterWhowas( CLIENT *Client )
{
int slot;
time_t now;
-
+
assert( Client != NULL );
now = time(NULL);
@@ -1164,7 +1161,7 @@ Client_RegisterWhowas( CLIENT *Client )
#ifdef DEBUG
Log( LOG_DEBUG, "Saving WHOWAS information to slot %d ...", slot );
#endif
-
+
My_Whowas[slot].time = now;
strlcpy( My_Whowas[slot].id, Client_ID( Client ),
sizeof( My_Whowas[slot].id ));
@@ -1176,7 +1173,7 @@ Client_RegisterWhowas( CLIENT *Client )
sizeof( My_Whowas[slot].info ));
strlcpy( My_Whowas[slot].server, Client_ID( Client_Introducer( Client )),
sizeof( My_Whowas[slot].server ));
-
+
Last_Whowas = slot;
} /* Client_RegisterWhowas */
blob - b48f804f3b32a3089864d4245ab90ff45e6bb735
blob + 0de367956bd8c5ebfb93b800d2c19a6583db6b58
--- src/ngircd/client.h
+++ src/ngircd/client.h
@@ -8,7 +8,7 @@
* (at your option) any later version.
* 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)
*/
@@ -137,11 +137,11 @@ GLOBAL bool Client_CheckID PARAMS(( CLIENT *Client, ch
GLOBAL long Client_UserCount PARAMS(( void ));
GLOBAL long Client_ServiceCount PARAMS(( void ));
GLOBAL long Client_ServerCount PARAMS(( void ));
-GLOBAL long Client_OperCount PARAMS(( void ));
-GLOBAL long Client_UnknownCount PARAMS(( void ));
+GLOBAL unsigned long Client_OperCount PARAMS(( void ));
+GLOBAL unsigned long Client_UnknownCount PARAMS(( void ));
GLOBAL long Client_MyUserCount 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_MyMaxUserCount PARAMS(( void ));
blob - ac9e9d805ae790700f45a85931775804c53b3476
blob + f24065a7c1a51acc266af3975fcc01704a976e22
--- src/ngircd/irc-info.c
+++ src/ngircd/irc-info.c
@@ -14,7 +14,7 @@
#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 <assert.h>
@@ -833,9 +833,9 @@ IRC_WHOWAS( CLIENT *Client, REQUEST *Req )
GLOBAL bool
IRC_Send_LUSERS( CLIENT *Client )
{
- long cnt;
+ unsigned long cnt;
#ifndef STRICT_RFC
- long max;
+ unsigned long max;
#endif
assert( Client != NULL );
blob - bc68373bda101b14f81cb8d9f708b4ee3368abfa
blob + b28a7ab0eb19c41a281858cbc5b2a02663cd4a69
--- src/ngircd/messages.h
+++ src/ngircd/messages.h
@@ -8,7 +8,7 @@
* (at your option) any later version.
* 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)
*/
@@ -33,17 +33,17 @@
#define RPL_ENDOFSTATS_MSG "219 %s %c :End of STATS report"
#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_LUSEROP_MSG "252 %s %ld :operator(s) online"
-#define RPL_LUSERUNKNOWN_MSG "253 %s %ld :unknown connection(s)"
+#define RPL_LUSEROP_MSG "252 %s %lu :operator(s) online"
+#define RPL_LUSERUNKNOWN_MSG "253 %s %lu :unknown connection(s)"
#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_ADMINLOC1_MSG "257 %s :%s"
#define RPL_ADMINLOC2_MSG "258 %s :%s"
#define RPL_ADMINEMAIL_MSG "259 %s :%s"
#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_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_USERHOST_MSG "302 %s :"
IRCNow