IRC_Send_NAMES(): Code cleanup

diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c
index 841e6e62739274a0b862ba4bab1284091605ff07..38b9a7d64f8cb89bd45f0b3ac34a291c3afa193c 100644 (file)
--- a/src/ngircd/irc-info.c
+++ b/src/ngircd/irc-info.c
@@ -1524,60 +1524,71 @@ IRC_Show_MOTD( CLIENT *Client )
 } /* IRC_Show_MOTD */
 
 
+/**
+ * Send NAMES reply for a specific client and channel.
+ *
+ * @param Client The client requesting the NAMES information.
+ * @param Chan The channel
+ * @return CONNECTED or DISCONNECTED.
+ */
 GLOBAL bool
-IRC_Send_NAMES( CLIENT *Client, CHANNEL *Chan )
+IRC_Send_NAMES(CLIENT * Client, CHANNEL * Chan)
 {
        bool is_visible, is_member;
        char str[LINE_LEN + 1];
        CL2CHAN *cl2chan;
        CLIENT *cl;
 
-       assert( Client != NULL );
-       assert( Chan != NULL );
+       assert(Client != NULL);
+       assert(Chan != NULL);
 
-       if( Channel_IsMemberOf( Chan, Client )) is_member = true;
-       else is_member = false;
+       if (Channel_IsMemberOf(Chan, Client))
+               is_member = true;
+       else
+               is_member = false;
 
        /* Do not print info on channel memberships to anyone that is not member? */
        if (Conf_MorePrivacy && !is_member)
                return CONNECTED;
 
        /* Secret channel? */
-       if( ! is_member && strchr( Channel_Modes( Chan ), 's' )) return CONNECTED;
-
-       /* Alle Mitglieder suchen */
-       snprintf( str, sizeof( str ), RPL_NAMREPLY_MSG, Client_ID( Client ), "=", Channel_Name( Chan ));
-       cl2chan = Channel_FirstMember( Chan );
-       while( cl2chan )
-       {
-               cl = Channel_GetClient( cl2chan );
+       if (!is_member && strchr(Channel_Modes(Chan), 's'))
+               return CONNECTED;
 
-               if( strchr( Client_Modes( cl ), 'i' )) is_visible = false;
-               else is_visible = true;
+       snprintf(str, sizeof(str), RPL_NAMREPLY_MSG, Client_ID(Client), "=",
+                Channel_Name(Chan));
+       cl2chan = Channel_FirstMember(Chan);
+       while (cl2chan) {
+               cl = Channel_GetClient(cl2chan);
 
-               if( is_member || is_visible )
-               {
-                       /* Nick anhaengen */
-                       if( str[strlen( str ) - 1] != ':' ) strlcat( str, " ", sizeof( str ));
-                       if( strchr( Channel_UserModes( Chan, cl ), 'o' )) strlcat( str, "@", sizeof( str ));
-                       else if( strchr( Channel_UserModes( Chan, cl ), 'v' )) strlcat( str, "+", sizeof( str ));
-                       strlcat( str, Client_ID( cl ), sizeof( str ));
+               if (strchr(Client_Modes(cl), 'i'))
+                       is_visible = false;
+               else
+                       is_visible = true;
 
-                       if( strlen( str ) > ( LINE_LEN - CLIENT_NICK_LEN - 4 ))
-                       {
-                               /* Zeile wird zu lang: senden! */
-                               if( ! IRC_WriteStrClient( Client, "%s", str )) return DISCONNECTED;
-                               snprintf( str, sizeof( str ), RPL_NAMREPLY_MSG, Client_ID( Client ), "=", Channel_Name( Chan ));
+               if (is_member || is_visible) {
+                       if (str[strlen(str) - 1] != ':')
+                               strlcat(str, " ", sizeof(str));
+                       if (strchr(Channel_UserModes(Chan, cl), 'o'))
+                               strlcat(str, "@", sizeof(str));
+                       else if (strchr(Channel_UserModes(Chan, cl), 'v'))
+                               strlcat(str, "+", sizeof(str));
+                       strlcat(str, Client_ID(cl), sizeof(str));
+
+                       if (strlen(str) > (LINE_LEN - CLIENT_NICK_LEN - 4)) {
+                               if (!IRC_WriteStrClient(Client, "%s", str))
+                                       return DISCONNECTED;
+                               snprintf(str, sizeof(str), RPL_NAMREPLY_MSG,
+                                        Client_ID(Client), "=",
+                                        Channel_Name(Chan));
                        }
                }
 
-               /* naechstes Mitglied suchen */
-               cl2chan = Channel_NextMember( Chan, cl2chan );
+               cl2chan = Channel_NextMember(Chan, cl2chan);
        }
-       if( str[strlen( str ) - 1] != ':')
-       {
-               /* Es sind noch Daten da, die gesendet werden muessen */
-               if( ! IRC_WriteStrClient( Client, "%s", str )) return DISCONNECTED;
+       if (str[strlen(str) - 1] != ':') {
+               if (!IRC_WriteStrClient(Client, "%s", str))
+                       return DISCONNECTED;
        }
 
        return CONNECTED;