NGIRCd_getNobodyID(): Code cleanup

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

diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c
index 84ba9d9b718e5e13b685a041833d314167396786..092ca0a3957dd2896ce6d01fafa4efb91fcbab07 100644 (file)
--- a/src/ngircd/irc-info.c
+++ b/src/ngircd/irc-info.c
@@ -154,6 +154,15 @@ IRC_INFO(CLIENT * Client, REQUEST * Req)
 } /* IRC_INFO */
 
 
+/**
+ * Handler for the IRC "ISON" command.
+ *
+ * See RFC 2812, 4.9 "Ison message".
+ *
+ * @param Client The client from which this command has been received.
+ * @param Req Request structure with prefix and all parameters.
+ * @return CONNECTED or DISCONNECTED.
+ */
 GLOBAL bool
 IRC_ISON( CLIENT *Client, REQUEST *Req )
 {
@@ -162,32 +171,32 @@ IRC_ISON( CLIENT *Client, REQUEST *Req )
        char *ptr;
        int i;
 
-       assert( Client != NULL );
-       assert( Req != NULL );
+       assert(Client != NULL);
+       assert(Req != NULL);
 
-       /* Falsche Anzahl Parameter? */
-       if(( Req->argc < 1 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+       /* Bad number of arguments? */
+       if (Req->argc < 1)
+               return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
+                                         Client_ID(Client), Req->command);
 
-       strlcpy( rpl, RPL_ISON_MSG, sizeof rpl );
-       for( i = 0; i < Req->argc; i++ )
-       {
-               ptr = strtok( Req->argv[i], " " );
-               while( ptr )
-               {
-                       ngt_TrimStr( ptr );
-                       c = Client_Search( ptr );
-                       if( c && ( Client_Type( c ) == CLIENT_USER ))
-                       {
-                               /* Dieser Nick ist "online" */
-                               strlcat( rpl, ptr, sizeof( rpl ));
-                               strlcat( rpl, " ", sizeof( rpl ));
+       strlcpy(rpl, RPL_ISON_MSG, sizeof rpl);
+       for (i = 0; i < Req->argc; i++) {
+               /* "All" ircd even parse ":<x> <y> ..." arguments and split
+                * them up; so we do the same ... */
+               ptr = strtok(Req->argv[i], " ");
+               while (ptr) {
+                       ngt_TrimStr(ptr);
+                       c = Client_Search(ptr);
+                       if (c && Client_Type(c) == CLIENT_USER) {
+                               strlcat(rpl, Client_ID(c), sizeof(rpl));
+                               strlcat(rpl, " ", sizeof(rpl));
                        }
-                       ptr = strtok( NULL, " " );
+                       ptr = strtok(NULL, " ");
                }
        }
        ngt_TrimLastChr(rpl, ' ');
 
-       return IRC_WriteStrClient( Client, rpl, Client_ID( Client ) );
+       return IRC_WriteStrClient(Client, rpl, Client_ID(Client));
 } /* IRC_ISON */
 
 
@@ -933,7 +942,7 @@ IRC_WHO_Mask(CLIENT *Client, char *Mask, bool OnlyOps)
 GLOBAL bool
 IRC_WHO(CLIENT *Client, REQUEST *Req)
 {
-       bool only_ops, have_arg;
+       bool only_ops;
        CHANNEL *chan;
 
        assert (Client != NULL);
@@ -944,7 +953,6 @@ IRC_WHO(CLIENT *Client, REQUEST *Req)
                                          Client_ID(Client), Req->command);
 
        only_ops = false;
-       have_arg = false;
 
        if (Req->argc == 2) {
                if (strcmp(Req->argv[1], "o") == 0)