- fehlenden Return-Wert ergaenzt (ich Dubel).

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

diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c
index 402cfead579d5c2e3c5601ec1cff3c3c0e677e53..ff75b0343cfed4819ee8b2063e7c736b82798fbe 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.95 2002/09/16 09:14:45 alex Exp $
+ * $Id: irc.c,v 1.98 2002/10/09 13:35:32 alex Exp $
  *
  * irc.c: IRC-Befehle
  */
@@ -109,7 +109,7 @@ IRC_NOTICE( CLIENT *Client, REQUEST *Req )
        assert( Client != NULL );
        assert( Req != NULL );
 
-       if(( Client_Type( Client ) != CLIENT_USER ) && ( Client_Type( Client ) != CLIENT_SERVER )) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client ));
+       if(( Client_Type( Client ) != CLIENT_USER ) && ( Client_Type( Client ) != CLIENT_SERVER )) return CONNECTED;
 
        /* Falsche Anzahl Parameter? */
        if( Req->argc != 2 ) return CONNECTED;
@@ -206,7 +206,7 @@ IRC_NAMES( CLIENT *Client, REQUEST *Req )
                        if( strlen( rpl ) > ( LINE_LEN - CLIENT_NICK_LEN - 4 ))
                        {
                                /* Zeile wird zu lang: senden! */
-                               if( ! IRC_WriteStrClient( from, rpl )) return DISCONNECTED;
+                               if( ! IRC_WriteStrClient( from, "%s", rpl )) return DISCONNECTED;
                                sprintf( rpl, RPL_NAMREPLY_MSG, Client_ID( from ), "*", "*" );
                        }
                }
@@ -217,7 +217,7 @@ IRC_NAMES( CLIENT *Client, REQUEST *Req )
        if( rpl[strlen( rpl ) - 1] != ':')
        {
                /* es wurden User gefunden */
-               if( ! IRC_WriteStrClient( from, rpl )) return DISCONNECTED;
+               if( ! IRC_WriteStrClient( from, "%s", rpl )) return DISCONNECTED;
        }
        
        return IRC_WriteStrClient( from, RPL_ENDOFNAMES_MSG, Client_ID( from ), "*" );
@@ -259,7 +259,7 @@ IRC_ISON( CLIENT *Client, REQUEST *Req )
        }
        if( rpl[strlen( rpl ) - 1] == ' ' ) rpl[strlen( rpl ) - 1] = '\0';
 
-       return IRC_WriteStrClient( Client, rpl, Client_ID( Client ) );
+       return IRC_WriteStrClient( Client, "%s", rpl, Client_ID( Client ) );
 } /* IRC_ISON */
 
 
@@ -325,7 +325,7 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req )
                if( strlen( str ) > ( LINE_LEN - CHANNEL_NAME_LEN - 4 ))
                {
                        /* Zeile wird zu lang: senden! */
-                       if( ! IRC_WriteStrClient( Client, str )) return DISCONNECTED;
+                       if( ! IRC_WriteStrClient( Client, "%s", str )) return DISCONNECTED;
                        sprintf( str, RPL_WHOISCHANNELS_MSG, Client_ID( from ), Client_ID( c ));
                }
 
@@ -335,7 +335,7 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req )
        if( str[strlen( str ) - 1] != ':')
        {
                /* Es sind noch Daten da, die gesendet werden muessen */
-               if( ! IRC_WriteStrClient( Client, str )) return DISCONNECTED;
+               if( ! IRC_WriteStrClient( Client, "%s", str )) return DISCONNECTED;
        }
        
        /* IRC-Operator? */
@@ -477,7 +477,7 @@ IRC_USERHOST( CLIENT *Client, REQUEST *Req )
        }
        if( rpl[strlen( rpl ) - 1] == ' ' ) rpl[strlen( rpl ) - 1] = '\0';
 
-       return IRC_WriteStrClient( Client, rpl, Client_ID( Client ) );
+       return IRC_WriteStrClient( Client, "%s", rpl, Client_ID( Client ) );
 } /* IRC_USERHOST */
 
 
@@ -768,7 +768,7 @@ IRC_Send_NAMES( CLIENT *Client, CHANNEL *Chan )
                        if( strlen( str ) > ( LINE_LEN - CLIENT_NICK_LEN - 4 ))
                        {
                                /* Zeile wird zu lang: senden! */
-                               if( ! IRC_WriteStrClient( Client, str )) return DISCONNECTED;
+                               if( ! IRC_WriteStrClient( Client, "%s", str )) return DISCONNECTED;
                                sprintf( str, RPL_NAMREPLY_MSG, Client_ID( Client ), "=", Channel_Name( Chan ));
                        }
                }
@@ -779,7 +779,7 @@ IRC_Send_NAMES( CLIENT *Client, CHANNEL *Chan )
        if( str[strlen( str ) - 1] != ':')
        {
                /* Es sind noch Daten da, die gesendet werden muessen */
-               if( ! IRC_WriteStrClient( Client, str )) return DISCONNECTED;
+               if( ! IRC_WriteStrClient( Client, "%s", str )) return DISCONNECTED;
        }
 
        return CONNECTED;