Fix compiler warning "comparision between signed and unsigned".

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

diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c
index 49cd211c2d04384bcbc12b57297fd35622d67c76..627c6402b0520e0e148b014825f8de0ffc720a03 100644 (file)
--- a/src/ngircd/conn.c
+++ b/src/ngircd/conn.c
@@ -16,7 +16,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: conn.c,v 1.152 2005/06/04 11:49:20 fw Exp $";
+static char UNUSED id[] = "$Id: conn.c,v 1.155 2005/06/26 13:43:59 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -1474,7 +1474,6 @@ Init_Conn_Struct( CONN_ID Idx )
 
        memset( &My_Connections[Idx], 0, sizeof ( CONNECTION ));
        My_Connections[Idx].sock = NONE;
-       My_Connections[Idx].starttime = now;
        My_Connections[Idx].lastdata = now;
        My_Connections[Idx].lastprivmsg = now;
 } /* Init_Conn_Struct */
@@ -1601,7 +1600,7 @@ try_resolve:
 #ifdef IDENTAUTH
                                /* clean up buffer for IDENT result */
                                len = strlen( s->buffer ) + 1;
-                               assert(len <= sizeof( s->buffer ));
+                               assert((size_t)len <= sizeof( s->buffer ));
                                memmove( s->buffer, s->buffer + len, sizeof( s->buffer ) - len );
                                assert(len <= s->bufpos );
                                s->bufpos -= len;
@@ -1651,15 +1650,16 @@ try_resolve:
 LOCAL void
 Simple_Message( int Sock, char *Msg )
 {
+       char buf[COMMAND_LEN];
        /* Write "simple" message to socket, without using compression
         * or even the connection write buffers. Used e.g. for error
         * messages by New_Connection(). */
-
        assert( Sock > NONE );
        assert( Msg != NULL );
 
-       (void)write( Sock, Msg, strlen( Msg ) );
-       (void)write( Sock, "\r\n", 2 );
+       strlcpy( buf, Msg, sizeof buf - 2);
+       strlcat( buf, "\r\n", sizeof buf);
+       (void)write( Sock, buf, strlen( buf ) );
 } /* Simple_Error */