commit - fa7bb2790a1588e49d05cf3404220c3a63669514
commit + fb0fbe908d97b520cdb6f8180db3d3288339142a
blob - 777ba20fb764c76bee3b36531c9bd11733110ddb
blob + e31b268f509da533bbe888d65e9157fd817e78da
--- src/ngircd/channel.c
+++ src/ngircd/channel.c
@@ -17,7 +17,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: channel.c,v 1.60 2006/12/07 17:57:20 fw Exp $";
+static char UNUSED id[] = "$Id: channel.c,v 1.61 2006/12/07 22:23:39 fw Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -334,25 +334,7 @@ Channel_CountForUser( CLIENT *Client )
 
 	return count;
 } /* Channel_CountForUser */
-
-
-GLOBAL int
-Channel_PCount( void )
-{
-	/* Count the number of persistent (mode 'P') channels */
-
-	CHANNEL *chan;
-	int count = 0;
-
-	chan = My_Channels;
-	while( chan )
-	{
-		if( strchr( chan->modes, 'P' )) count++;
-		chan = chan->next;
-	}
 
-	return count;
-} /* Channel_PCount */
 
 
 GLOBAL const char *
@@ -617,9 +599,7 @@ Channel_IsMemberOf( CHANNEL *Chan, CLIENT *Client )
 
 	assert( Chan != NULL );
 	assert( Client != NULL );
-
-	if( Get_Cl2Chan( Chan, Client )) return true;
-	else return false;
+	return Get_Cl2Chan(Chan, Client);
 } /* Channel_IsMemberOf */
 
 
blob - 6117c669121a0d3aa1ea06b604851c21732abce0
blob + 023a41e5a567e6eeb1a53662994ea1f3c73fef28
--- src/ngircd/channel.h
+++ src/ngircd/channel.h
@@ -8,7 +8,7 @@
  * (at your option) any later version.
  * Please read the file COPYING, README and AUTHORS for more information.
  *
- * $Id: channel.h,v 1.32 2006/12/07 17:57:20 fw Exp $
+ * $Id: channel.h,v 1.33 2006/12/07 22:23:39 fw Exp $
  *
  * Channel management (header)
  */
@@ -73,7 +73,6 @@ GLOBAL void Channel_Kick PARAMS((  CLIENT *Client, CLI
 GLOBAL unsigned long Channel_Count PARAMS(( void ));
 GLOBAL unsigned long Channel_MemberCount PARAMS(( CHANNEL *Chan ));
 GLOBAL int Channel_CountForUser PARAMS(( CLIENT *Client ));
-GLOBAL int Channel_PCount PARAMS(( void ));
 
 GLOBAL const char *Channel_Name PARAMS(( const CHANNEL *Chan ));
 GLOBAL char *Channel_Modes PARAMS(( CHANNEL *Chan ));