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 624ff1e17f4c965f85f1743a820ca0e447dbce60..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.87 2006/03/11 01:37:31 alex 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>
@@ -321,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 );
                                }
                        }
 
@@ -568,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.
         */
 
@@ -1175,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;
@@ -1189,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 ),