Use some more specific data types (e. g. pid_t vs. int), make "SPLint" happy :-)

[ngircd.git] / src / ngircd / irc.c

diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c
index b0328d223355a41600fbfc7bb1131c6d9be0accd..6889cff2758f035d67eaa6dffb820e8ff39d018e 100644 (file)
--- a/src/ngircd/irc.c
+++ b/src/ngircd/irc.c
@@ -14,7 +14,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: irc.c,v 1.127 2005/07/31 20:13:08 alex Exp $";
+static char UNUSED id[] = "$Id: irc.c,v 1.130 2006/05/10 21:24:01 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -151,7 +151,7 @@ IRC_KILL( CLIENT *Client, REQUEST *Req )
                }
 
                /* Kill client NOW! */
-               conn = Client_Conn( Client_NextHop( c ));
+               conn = Client_Conn( c );
                Client_Destroy( c, NULL, reason, false );
                if( conn > NONE )
                        Conn_Close( conn, NULL, reason, true );
@@ -160,7 +160,7 @@ IRC_KILL( CLIENT *Client, REQUEST *Req )
                Log( LOG_NOTICE, "Client with nick \"%s\" is unknown here.", Req->argv[0] );
 
        /* Are we still connected or were we killed, too? */
-       if(( my_conn > NONE ) && ( Client_GetFromConn( my_conn )))
+       if(( my_conn > NONE ) && ( Conn_GetClient( my_conn )))
                return CONNECTED;
        else
                return DISCONNECTED;
@@ -329,13 +329,15 @@ static char *
 Option_String( CONN_ID Idx )
 {
        static char option_txt[8];
-       int options;
+       UINT16 options;
 
-       options = Conn_Options( Idx );
+       options = Conn_Options(Idx);
 
-       strcpy( option_txt, "F" );      /* No idea what this means but the original ircd sends it ... */
+       strcpy(option_txt, "F");        /* No idea what this means, but the
+                                        * original ircd sends it ... */
 #ifdef ZLIB
-       if( options & CONN_ZIP ) strcat( option_txt, "z" );
+       if(options & CONN_ZIP)          /* zlib compression supported. */
+               strcat(option_txt, "z");
 #endif
 
        return option_txt;