providers/opm: use a name that makes more sense for this variable

[solanum.git] / ircd / channel.c

diff --git a/ircd/channel.c b/ircd/channel.c
index f2836ba58151bc4c5fbb6e000277d9d4ad6cf166..4609325ab3266a60dd4c905e101608a00b281359 100644 (file)
--- a/ircd/channel.c
+++ b/ircd/channel.c
@@ -20,15 +20,12 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
- *
- *  $Id: channel.c 3580 2007-11-07 23:45:14Z jilles $
  */
 
 #include "stdinc.h"
 #include "channel.h"
 #include "chmode.h"
 #include "client.h"
-#include "common.h"
 #include "hash.h"
 #include "hook.h"
 #include "match.h"
@@ -339,23 +336,23 @@ invalidate_bancache_user(struct Client *client_p)
 /* check_channel_name()
  *
  * input       - channel name
- * output      - 1 if valid channel name, else 0
+ * output      - true if valid channel name, else false
  * side effects -
  */
-int
+bool
 check_channel_name(const char *name)
 {
        s_assert(name != NULL);
        if(name == NULL)
-               return 0;
+               return false;
 
        for (; *name; ++name)
        {
                if(!IsChanChar(*name))
-                       return 0;
+                       return false;
        }
 
-       return 1;
+       return true;
 }
 
 /* free_channel_list()
@@ -583,7 +580,7 @@ is_banned_list(struct Channel *chptr, rb_dlink_list *list,
                }
        }
 #ifdef RB_IPV6
-       if(who->localClient->ip.ss_family == AF_INET6 &&
+       if(GET_SS_FAMILY(&who->localClient->ip) == AF_INET6 &&
                        ipv4_from_ipv6((const struct sockaddr_in6 *)&who->localClient->ip, &ip4))
        {
                sprintf(src_ip4host, "%s!%s@", who->name, who->username);
@@ -904,11 +901,11 @@ can_send(struct Channel *chptr, struct Client *source_p, struct membership *mspt
  * inputs       - flag 0 if PRIVMSG 1 if NOTICE. RFC
  *                says NOTICE must not auto reply
  *              - pointer to source Client
- *             - pointer to target channel
- * output      - 1 if target is under flood attack
+ *              - pointer to target channel
+ * output       - true if target is under flood attack
  * side effects        - check for flood attack on target chptr
  */
-int
+bool
 flood_attack_channel(int p_or_n, struct Client *source_p, struct Channel *chptr, char *chname)
 {
        int delta;
@@ -946,13 +943,13 @@ flood_attack_channel(int p_or_n, struct Client *source_p, struct Channel *chptr,
                                sendto_one(source_p,
                                           ":%s NOTICE %s :*** Message to %s throttled due to flooding",
                                           me.name, source_p->name, chptr->chname);
-                       return 1;
+                       return true;
                }
                else
                        chptr->received_number_of_privmsgs++;
        }
 
-       return 0;
+       return false;
 }
 
 /* find_bannickchange_channel()