Commit Diff

Commit:
c634303765c20083c8f554f4d4084526d3e58fef
From:
Dana Dahlstrom <dana+70@cs.ucsd.edu>
Via:
Florian Westphal <fw@strlen.de>
Date:
Message:
Remove duplicate Channel_FirstChannelOf(). noticed there's a way to make the loop slightly more elegant. [fw@strlen.de: Extra () to silence gcc.]
Actions:
Patch | Tree
commit - cb0d594e6184694f8563f1e3116e3aac34606a86
commit + c634303765c20083c8f554f4d4084526d3e58fef
blob - 3481e19e66e617cb34039e00f35489cb8cd75dba
blob + 514af7fa99aac3cec11fe993b6d4b55d28a819b1
--- src/ngircd/irc-channel.c
+++ src/ngircd/irc-channel.c
@@ -14,7 +14,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: irc-channel.c,v 1.42 2008/02/05 13:31:50 fw Exp $";
+static char UNUSED id[] = "$Id: irc-channel.c,v 1.43 2008/02/05 19:00:52 fw Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -51,16 +51,13 @@ static char UNUSED id[] = "$Id: irc-channel.c,v 1.42 2
 static bool
 part_from_all_channels(CLIENT* client, CLIENT *target)
 {
-	CL2CHAN *cl2chan = Channel_FirstChannelOf(target);
+	CL2CHAN *cl2chan;
 	CHANNEL *chan;
 
-	while (cl2chan) {
+	while ((cl2chan = Channel_FirstChannelOf(target))) {
 		chan = Channel_GetChannel(cl2chan);
 		assert( chan != NULL );
 		Channel_Part(target, client, Channel_Name(chan), Client_ID(target));
-
-		/* next */
-		cl2chan = Channel_FirstChannelOf(target);
 	}
 	return CONNECTED;
 }