- verwendete Datentypen aufgeraumt: beispielsweise INT32 ist nun oft ein LONG.

diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c
index 50cce094c1f7b448fc17645a65b66ffab2f7600f..dc06042cc1b5ff5fefe9c28e1f692fef44b4be74 100644 (file)
--- a/src/ngircd/channel.c
+++ b/src/ngircd/channel.c
@@ -9,7 +9,7 @@
  * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
  * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
  *
- * $Id: channel.c,v 1.32 2002/09/03 23:57:57 alex Exp $
+ * $Id: channel.c,v 1.33 2002/10/09 16:53:02 alex Exp $
  *
  * channel.c: Management der Channels
  */
@@ -249,11 +249,11 @@ Channel_Quit( CLIENT *Client, CHAR *Reason )
 } /* Channel_Quit */
 
 
-GLOBAL INT
+GLOBAL LONG
 Channel_Count( VOID )
 {
        CHANNEL *c;
-       INT count;
+       LONG count;
        
        count = 0;
        c = My_Channels;
@@ -266,11 +266,11 @@ Channel_Count( VOID )
 } /* Channel_Count */
 
 
-GLOBAL INT
+GLOBAL LONG
 Channel_MemberCount( CHANNEL *Chan )
 {
        CL2CHAN *cl2chan;
-       INT count;
+       LONG count;
 
        assert( Chan != NULL );
 

diff --git a/src/ngircd/channel.h b/src/ngircd/channel.h
index aad7b1878d9f9af8d0bc542eb5d93d2a64adef10..4ba1ef537706278ddb7de14b35728ca1a7206d87 100644 (file)
--- a/src/ngircd/channel.h
+++ b/src/ngircd/channel.h
@@ -9,7 +9,7 @@
  * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
  * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
  *
- * $Id: channel.h,v 1.21 2002/09/03 23:57:57 alex Exp $
+ * $Id: channel.h,v 1.22 2002/10/09 16:53:02 alex Exp $
  *
  * channel.h: Management der Channels (Header)
  */
@@ -59,8 +59,8 @@ GLOBAL VOID Channel_Quit PARAMS((CLIENT *Client, CHAR *Reason ));
 
 GLOBAL VOID Channel_Kick PARAMS(( CLIENT *Client, CLIENT *Origin, CHAR *Name, CHAR *Reason ));
 
-GLOBAL INT Channel_Count PARAMS((VOID ));
-GLOBAL INT Channel_MemberCount PARAMS((CHANNEL *Chan ));
+GLOBAL LONG Channel_Count PARAMS((VOID ));
+GLOBAL LONG Channel_MemberCount PARAMS((CHANNEL *Chan ));
 
 GLOBAL CHAR *Channel_Name PARAMS((CHANNEL *Chan ));
 GLOBAL CHAR *Channel_Modes PARAMS((CHANNEL *Chan ));

diff --git a/src/ngircd/client.c b/src/ngircd/client.c
index cc6641405b4eee17199b27bbb6127f7ddfa0f184..daa65b148415fd7992f29f8b9f0102581973981f 100644 (file)
--- a/src/ngircd/client.c
+++ b/src/ngircd/client.c
@@ -9,7 +9,7 @@
  * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
  * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
  *
- * $Id: client.c,v 1.61 2002/10/04 12:39:58 alex Exp $
+ * $Id: client.c,v 1.62 2002/10/09 16:53:02 alex Exp $
  *
  * client.c: Management aller Clients
  *
@@ -60,8 +60,8 @@ LOCAL CLIENT *This_Server, *My_Clients;
 LOCAL CHAR GetID_Buffer[GETID_LEN];
 
 
-LOCAL INT Count PARAMS(( CLIENT_TYPE Type ));
-LOCAL INT MyCount PARAMS(( CLIENT_TYPE Type ));
+LOCAL LONG Count PARAMS(( CLIENT_TYPE Type ));
+LOCAL LONG MyCount PARAMS(( CLIENT_TYPE Type ));
 
 LOCAL CLIENT *New_Client_Struct PARAMS(( VOID ));
 LOCAL VOID Generate_MyToken PARAMS(( CLIENT *Client ));
@@ -840,46 +840,46 @@ Client_Next( CLIENT *c )
 } /* Client_Next */
 
 
-GLOBAL INT
+GLOBAL LONG
 Client_UserCount( VOID )
 {
        return Count( CLIENT_USER );
 } /* Client_UserCount */
 
 
-GLOBAL INT
+GLOBAL LONG
 Client_ServiceCount( VOID )
 {
        return Count( CLIENT_SERVICE );;
 } /* Client_ServiceCount */
 
 
-GLOBAL INT
+GLOBAL LONG
 Client_ServerCount( VOID )
 {
        return Count( CLIENT_SERVER );
 } /* Client_ServerCount */
 
 
-GLOBAL INT
+GLOBAL LONG
 Client_MyUserCount( VOID )
 {
        return MyCount( CLIENT_USER );
 } /* Client_MyUserCount */
 
 
-GLOBAL INT
+GLOBAL LONG
 Client_MyServiceCount( VOID )
 {
        return MyCount( CLIENT_SERVICE );
 } /* Client_MyServiceCount */
 
 
-GLOBAL INT
+GLOBAL LONG
 Client_MyServerCount( VOID )
 {
        CLIENT *c;
-       INT cnt;
+       LONG cnt;
 
        cnt = 0;
        c = My_Clients;
@@ -892,11 +892,11 @@ Client_MyServerCount( VOID )
 } /* Client_MyServerCount */
 
 
-GLOBAL INT
+GLOBAL LONG
 Client_OperCount( VOID )
 {
        CLIENT *c;
-       INT cnt;
+       LONG cnt;
 
        cnt = 0;
        c = My_Clients;
@@ -909,11 +909,11 @@ Client_OperCount( VOID )
 } /* Client_OperCount */
 
 
-GLOBAL INT
+GLOBAL LONG
 Client_UnknownCount( VOID )
 {
        CLIENT *c;
-       INT cnt;
+       LONG cnt;
 
        cnt = 0;
        c = My_Clients;
@@ -953,11 +953,11 @@ Client_IsValidNick( CHAR *Nick )
 } /* Client_IsValidNick */
 
 
-LOCAL INT
+LOCAL LONG
 Count( CLIENT_TYPE Type )
 {
        CLIENT *c;
-       INT cnt;
+       LONG cnt;
 
        cnt = 0;
        c = My_Clients;
@@ -970,11 +970,11 @@ Count( CLIENT_TYPE Type )
 } /* Count */
 
 
-LOCAL INT
+LOCAL LONG
 MyCount( CLIENT_TYPE Type )
 {
        CLIENT *c;
-       INT cnt;
+       LONG cnt;
 
        cnt = 0;
        c = My_Clients;

diff --git a/src/ngircd/client.h b/src/ngircd/client.h
index a832a1ffe65e3b555154fd356becc22ac4824fda..db8f7930c1a3ae1cc44e25c4367e2b3264fa31f3 100644 (file)
--- a/src/ngircd/client.h
+++ b/src/ngircd/client.h
@@ -9,7 +9,7 @@
  * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
  * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
  *
- * $Id: client.h,v 1.29 2002/09/03 18:54:31 alex Exp $
+ * $Id: client.h,v 1.30 2002/10/09 16:53:02 alex Exp $
  *
  * client.h: Konfiguration des ngircd (Header)
  */
@@ -124,14 +124,14 @@ GLOBAL BOOLEAN Client_ModeDel PARAMS((CLIENT *Client, CHAR Mode ));
 GLOBAL BOOLEAN Client_CheckNick PARAMS((CLIENT *Client, CHAR *Nick ));
 GLOBAL BOOLEAN Client_CheckID PARAMS((CLIENT *Client, CHAR *ID ));
 
-GLOBAL INT Client_UserCount PARAMS((VOID ));
-GLOBAL INT Client_ServiceCount PARAMS((VOID ));
-GLOBAL INT Client_ServerCount PARAMS((VOID ));
-GLOBAL INT Client_OperCount PARAMS((VOID ));
-GLOBAL INT Client_UnknownCount PARAMS((VOID ));
-GLOBAL INT Client_MyUserCount PARAMS((VOID ));
-GLOBAL INT Client_MyServiceCount PARAMS((VOID ));
-GLOBAL INT Client_MyServerCount PARAMS((VOID ));
+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 LONG Client_MyUserCount PARAMS((VOID ));
+GLOBAL LONG Client_MyServiceCount PARAMS((VOID ));
+GLOBAL LONG Client_MyServerCount PARAMS((VOID ));
 
 GLOBAL BOOLEAN Client_IsValidNick PARAMS((CHAR *Nick ));
 

diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c
index 54506a0754fe810f9e77506259e436e3b057e9f2..40859888d217b19eb1bcb6e86853d3027b4ec593 100644 (file)
--- a/src/ngircd/conf.c
+++ b/src/ngircd/conf.c
@@ -9,7 +9,7 @@
  * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
  * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
  *
- * $Id: conf.c,v 1.32 2002/10/04 11:21:46 alex Exp $
+ * $Id: conf.c,v 1.33 2002/10/09 16:53:02 alex Exp $
  *
  * conf.h: Konfiguration des ngircd
  */
@@ -98,8 +98,8 @@ Conf_Test( VOID )
                printf( "%u", Conf_ListenPorts[i] );
        }
        puts( "" );
-       printf( "  ServerUID = %ld\n", (INT32)Conf_UID );
-       printf( "  ServerGID = %ld\n", (INT32)Conf_GID );
+       printf( "  ServerUID = %ld\n", (LONG)Conf_UID );
+       printf( "  ServerGID = %ld\n", (LONG)Conf_GID );
        printf( "  PingTimeout = %d\n", Conf_PingTimeout );
        printf( "  PongTimeout = %d\n", Conf_PongTimeout );
        printf( "  ConnectRetry = %d\n", Conf_ConnectRetry );
@@ -295,7 +295,7 @@ LOCAL VOID
 Handle_GLOBAL( INT Line, CHAR *Var, CHAR *Arg )
 {
        CHAR *ptr;
-       INT32 port;
+       LONG port;
        
        assert( Line > 0 );
        assert( Var != NULL );
@@ -446,7 +446,7 @@ Handle_OPERATOR( INT Line, CHAR *Var, CHAR *Arg )
 LOCAL VOID
 Handle_SERVER( INT Line, CHAR *Var, CHAR *Arg )
 {
-       INT32 port;
+       LONG port;
        
        assert( Line > 0 );
        assert( Var != NULL );

diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c
index da7cc63b56fda202bc8166a2b24ae33a32da7c48..257801564efb2acc4b07cc6933435b984faaebaa 100644 (file)
--- a/src/ngircd/conn.c
+++ b/src/ngircd/conn.c
@@ -9,7 +9,7 @@
  * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
  * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
  *
- * $Id: conn.c,v 1.77 2002/10/09 13:34:19 alex Exp $
+ * $Id: conn.c,v 1.78 2002/10/09 16:53:02 alex Exp $
  *
  * connect.h: Verwaltung aller Netz-Verbindungen ("connections")
  */
@@ -75,7 +75,7 @@ typedef struct _Connection
        time_t lastping;                /* Letzter PING */
        time_t lastprivmsg;             /* Letzte PRIVMSG */
        time_t delaytime;               /* Nicht beachten bis ("penalty") */
-       INT32 bytes_in, bytes_out;      /* Counter fuer Statistik */
+       LONG bytes_in, bytes_out;       /* Counter fuer Statistik */
 } CONNECTION;
 
 

diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c
index ff75b0343cfed4819ee8b2063e7c736b82798fbe..fca321dd3bb3ab1ae8c76072dfefe68c73b3e2c3 100644 (file)
--- a/src/ngircd/irc.c
+++ b/src/ngircd/irc.c
@@ -9,7 +9,7 @@
  * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
  * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
  *
- * $Id: irc.c,v 1.98 2002/10/09 13:35:32 alex Exp $
+ * $Id: irc.c,v 1.99 2002/10/09 16:53:02 alex Exp $
  *
  * irc.c: IRC-Befehle
  */
@@ -834,7 +834,7 @@ IRC_Send_WHO( CLIENT *Client, CHANNEL *Chan, BOOLEAN OnlyOps )
 GLOBAL BOOLEAN
 IRC_Send_LUSERS( CLIENT *Client )
 {
-       INT cnt;
+       LONG cnt;
 
        assert( Client != NULL );
 

diff --git a/src/ngircd/log.c b/src/ngircd/log.c
index b2abdb353825345ca7d58a509d8e44b5f5583759..c8a5e477a89bcb0178a27157077c3d9d55440175 100644 (file)
--- a/src/ngircd/log.c
+++ b/src/ngircd/log.c
@@ -9,7 +9,7 @@
  * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
  * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
  *
- * $Id: log.c,v 1.39 2002/10/09 13:15:18 alex Exp $
+ * $Id: log.c,v 1.40 2002/10/09 16:53:02 alex Exp $
  *
  * log.c: Logging-Funktionen
  */
@@ -96,7 +96,7 @@ Log_InitErrorfile( VOID )
         * landen z.B. alle Ausgaben von assert()-Aufrufen. */
 
        /* Dateiname zusammen bauen */
-       sprintf( Error_File, "%s/%s-%ld.err", ERROR_DIR, PACKAGE, (INT32)getpid( ));
+       sprintf( Error_File, "%s/%s-%ld.err", ERROR_DIR, PACKAGE, (LONG)getpid( ));
 
        /* stderr umlenken */
        fflush( stderr );

diff --git a/src/ngircd/messages.h b/src/ngircd/messages.h
index f5c1c7e08dff52da5e04dadad99b3dc2bbae972f..561f8ca16e642a1c98f107758eea656b86554f5c 100644 (file)
--- a/src/ngircd/messages.h
+++ b/src/ngircd/messages.h
@@ -9,7 +9,7 @@
  * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
  * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
  *
- * $Id: messages.h,v 1.47 2002/10/03 15:49:17 alex Exp $
+ * $Id: messages.h,v 1.48 2002/10/09 16:53:02 alex Exp $
  *
  * irc.h: IRC-Befehle (Header)
  */
@@ -24,11 +24,11 @@
 #define RPL_CREATED_MSG                        "003 %s :This server has been started %s"
 #define RPL_MYINFO_MSG                 "004 %s %s ngircd-%s %s %s"
 #define RPL_UMODEIS_MSG                        "211 %s +%s"
-#define RPL_LUSERCLIENT_MSG            "251 %s :There are %d users and %d services on %d servers"
-#define RPL_LUSEROP_MSG                        "252 %s %d :operator(s) online"
-#define        RPL_LUSERUNKNOWN_MSG            "253 %s %d :unknown connection(s)"
-#define RPL_LUSERCHANNELS_MSG          "254 %s %d :channels formed"
-#define        RPL_LUSERME_MSG                 "255 %s :I have %d users, %d services and %d 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_LUSERUNKNOWN_MSG            "253 %s %ld :unknown connection(s)"
+#define RPL_LUSERCHANNELS_MSG          "254 %s %ld :channels formed"
+#define        RPL_LUSERME_MSG                 "255 %s :I have %ld users, %ld services and %ld servers"
 #define RPL_ADMINME_MSG                        "256 %s %s :Administrative info"
 #define RPL_ADMINLOC1_MSG              "257 %s :%s"
 #define RPL_ADMINLOC2_MSG              "258 %s :%s"
@@ -46,7 +46,7 @@
 #define RPL_WHOISIDLE_MSG              "317 %s %s %ld :seconds idle"
 #define RPL_ENDOFWHOIS_MSG             "318 %s %s :End of WHOIS list"
 #define RPL_WHOISCHANNELS_MSG          "319 %s %s :"
-#define RPL_LIST_MSG                   "322 %s %s %d :%s"
+#define RPL_LIST_MSG                   "322 %s %s %ld :%s"
 #define RPL_LISTEND_MSG                        "323 %s :End of LIST"
 #define RPL_CHANNELMODEIS_MSG          "324 %s %s +%s"
 #define RPL_NOTOPIC_MSG                        "331 %s %s :No topic is set"

diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c
index 38beb78f3835b590ae8d61f6fd61200f11b11466..b19f702868de5558284adb9fe7c90f564f3a9693 100644 (file)
--- a/src/ngircd/ngircd.c
+++ b/src/ngircd/ngircd.c
@@ -9,7 +9,7 @@
  * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
  * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
  *
- * $Id: ngircd.c,v 1.56 2002/10/07 21:16:13 alex Exp $
+ * $Id: ngircd.c,v 1.57 2002/10/09 16:53:02 alex Exp $
  *
  * ngircd.c: Hier beginnt alles ;-)
  */
@@ -59,7 +59,7 @@ GLOBAL int
 main( int argc, const char *argv[] )
 {
        BOOLEAN ok, configtest = FALSE;
-       INT32 pid, n;
+       LONG pid, n;
        INT i;
 
        umask( 0077 );
@@ -141,7 +141,7 @@ main( int argc, const char *argv[] )
                {
                        /* Kurze Option */
                        
-                       for( n = 1; n < (INT32)strlen( argv[i] ); n++ )
+                       for( n = 1; n < (LONG)strlen( argv[i] ); n++ )
                        {
                                ok = FALSE;
 #ifdef DEBUG
@@ -160,7 +160,7 @@ main( int argc, const char *argv[] )
                                                NGIRCd_ConfFile[FNAME_LEN - 1] = '\0';
 
                                                /* zum uebernaechsten Parameter */
-                                               i++; n = (INT32)strlen( argv[i] );
+                                               i++; n = (LONG)strlen( argv[i] );
                                                ok = TRUE;
                                        }
                                }
@@ -228,7 +228,7 @@ main( int argc, const char *argv[] )
                if( ! NGIRCd_NoDaemon )
                {
                        /* Daemon im Hintergrund erzeugen */
-                       pid = (INT32)fork( );
+                       pid = (LONG)fork( );
                        if( pid > 0 )
                        {
                                /* "alter" Prozess */
@@ -276,7 +276,7 @@ main( int argc, const char *argv[] )
                                if( setuid( Conf_UID ) != 0 ) Log( LOG_ERR, "Can't change User-ID to %u: %s", Conf_UID, strerror( errno ));
                        }
                }
-               Log( LOG_INFO, "Running as user %ld, group %ld, with PID %ld.", (INT32)getuid( ), (INT32)getgid( ), (INT32)getpid( ));
+               Log( LOG_INFO, "Running as user %ld, group %ld, with PID %ld.", (LONG)getuid( ), (LONG)getgid( ), (LONG)getpid( ));
 
                Log_InitErrorfile( );