fix ngt_TrimStr(), fix format string

[ngircd-alex.git] / src / ngircd / client.c

diff --git a/src/ngircd/client.c b/src/ngircd/client.c
index ca50d37cb900304becd31be98d98c3faf3dd270e..30e214c440c74f95a2b563e313884884ae9a3498 100644 (file)
--- a/src/ngircd/client.c
+++ b/src/ngircd/client.c
@@ -17,7 +17,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: client.c,v 1.86 2006/03/10 20:25:29 fw Exp $";
+static char UNUSED id[] = "$Id: client.c,v 1.90 2006/03/24 23:25:38 fw Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -64,6 +64,10 @@ static CLIENT *New_Client_Struct PARAMS(( void ));
 static void Generate_MyToken PARAMS(( CLIENT *Client ));
 static void Adjust_Counters PARAMS(( CLIENT *Client ));
 
+static CLIENT *Init_New_Client PARAMS((CONN_ID Idx, CLIENT *Introducer,
+ CLIENT *TopServer, int Type, char *ID, char *User, char *Hostname,
+ char *Info, int Hops, int Token, char *Modes, bool Idented));
+
 #ifndef Client_DestroyNow
 GLOBAL void Client_DestroyNow PARAMS((CLIENT *Client ));
 #endif
@@ -135,32 +139,53 @@ Client_ThisServer( void )
 } /* Client_ThisServer */
 
 
+/**
+ * Initialize new local client; wrapper function for Init_New_Client().
+ * @return New CLIENT structure.
+ */
 GLOBAL CLIENT *
-Client_NewLocal( CONN_ID Idx, char *Hostname, int Type, bool Idented )
+Client_NewLocal(CONN_ID Idx, char *Hostname, int Type, bool Idented)
 {
-       /* Neuen lokalen Client erzeugen: Wrapper-Funktion fuer Client_New(). */
-       return Client_New( Idx, This_Server, NULL, Type, NULL, NULL, Hostname, NULL, 0, 0, NULL, Idented );
+       return Init_New_Client(Idx, This_Server, NULL, Type, NULL, NULL,
+               Hostname, NULL, 0, 0, NULL, Idented);
 } /* Client_NewLocal */
 
 
+/**
+ * Initialize new remote server; wrapper function for Init_New_Client().
+ * @return New CLIENT structure.
+ */
 GLOBAL CLIENT *
-Client_NewRemoteServer( CLIENT *Introducer, char *Hostname, CLIENT *TopServer, int Hops, int Token, char *Info, bool Idented )
+Client_NewRemoteServer(CLIENT *Introducer, char *Hostname, CLIENT *TopServer,
+ int Hops, int Token, char *Info, bool Idented)
 {
-       /* Neuen Remote-Client erzeugen: Wrapper-Funktion fuer Client_New (). */
-       return Client_New( NONE, Introducer, TopServer, CLIENT_SERVER, Hostname, NULL, Hostname, Info, Hops, Token, NULL, Idented );
+       return Init_New_Client(NONE, Introducer, TopServer, CLIENT_SERVER,
+               Hostname, NULL, Hostname, Info, Hops, Token, NULL, Idented);
 } /* Client_NewRemoteServer */
 
 
+/**
+ * Initialize new remote client; wrapper function for Init_New_Client().
+ * @return New CLIENT structure.
+ */
 GLOBAL CLIENT *
-Client_NewRemoteUser( CLIENT *Introducer, char *Nick, int Hops, char *User, char *Hostname, int Token, char *Modes, char *Info, bool Idented )
+Client_NewRemoteUser(CLIENT *Introducer, char *Nick, int Hops, char *User,
+ char *Hostname, int Token, char *Modes, char *Info, bool Idented)
 {
-       /* Neuen Remote-Client erzeugen: Wrapper-Funktion fuer Client_New (). */
-       return Client_New( NONE, Introducer, NULL, CLIENT_USER, Nick, User, Hostname, Info, Hops, Token, Modes, Idented );
+       return Init_New_Client(NONE, Introducer, NULL, CLIENT_USER, Nick,
+               User, Hostname, Info, Hops, Token, Modes, Idented);
 } /* Client_NewRemoteUser */
 
 
+/**
+ * Initialize new client and set up the given parameters like client type,
+ * user name, host name, introducing server etc. ...
+ * @return New CLIENT structure.
+ */
 static CLIENT *
-Client_New( CONN_ID Idx, CLIENT *Introducer, CLIENT *TopServer, int Type, char *ID, char *User, char *Hostname, char *Info, int Hops, int Token, char *Modes, bool Idented )
+Init_New_Client(CONN_ID Idx, CLIENT *Introducer, CLIENT *TopServer,
+ int Type, char *ID, char *User, char *Hostname, char *Info, int Hops,
+ int Token, char *Modes, bool Idented)
 {
        CLIENT *client;
 
@@ -197,7 +222,7 @@ Client_New( CONN_ID Idx, CLIENT *Introducer, CLIENT *TopServer, int Type, char *
        Adjust_Counters( client );
 
        return client;
-} /* Client_New */
+} /* Init_New_Client */
 
 
 GLOBAL void
@@ -296,11 +321,9 @@ Client_Destroy( CLIENT *Client, char *LogMsg, char *FwdMsg, bool SendQuit )
                                {
                                        if( c->id[0] ) Log( LOG_NOTICE, "Client \"%s\" unregistered (connection %d): %s", c->id, c->conn_id, txt );
                                        else Log( LOG_NOTICE, "Client unregistered (connection %d): %s", c->conn_id, txt );
-                               }
-                               else
-                               {
-                                       if( c->id[0] ) Log( LOG_WARNING, "Unregistered unknown client \"%s\": %s", c->id, txt );
-                                       else Log( LOG_WARNING, "Unregistered unknown client: %s", c->id, txt );
+                               } else {
+                                       Log(LOG_WARNING, "Unregistered unknown client \"%s\": %s",
+                                                               c->id[0] ? c->id : "(No Nick)", txt );
                                }
                        }
 
@@ -543,7 +566,7 @@ Client_ModeDel( CLIENT *Client, char Mode )
 GLOBAL CLIENT *
 Client_GetFromConn( CONN_ID Idx )
 {
-       /* return Client-Structure that belongs to the local Connection Idx gehoert.
+       /* return Client-Structure that belongs to the local Connection Idx.
         * If none is found, return NULL.
         */
 
@@ -1150,11 +1173,13 @@ GLOBAL void
 Client_RegisterWhowas( CLIENT *Client )
 {
        int slot;
+       time_t now;
        
        assert( Client != NULL );
 
+       now = time(NULL);
        /* Don't register clients that were connected less than 30 seconds. */
-       if( time(NULL) - Client->starttime < 30 )
+       if( now - Client->starttime < 30 )
                return;
 
        slot = Last_Whowas + 1;
@@ -1164,7 +1189,7 @@ Client_RegisterWhowas( CLIENT *Client )
        Log( LOG_DEBUG, "Saving WHOWAS information to slot %d ...", slot );
 #endif
        
-       My_Whowas[slot].time = time( NULL );
+       My_Whowas[slot].time = now;
        strlcpy( My_Whowas[slot].id, Client_ID( Client ),
                 sizeof( My_Whowas[slot].id ));
        strlcpy( My_Whowas[slot].user, Client_User( Client ),