From: wiebe <redacted>
Date: Sat, 20 Mar 2010 17:17:27 +0000 (+0100)
Subject: centralizemodeccchecks: removed unneeded () around control var
X-Git-Url: https://jfr.im/git/irc/quakenet/snircd-patchqueue.git/commitdiff_plain/d2d7c5381690574f6b202ae60e8ee50234deca55

centralizemodeccchecks: removed unneeded () around control var
---

diff --git a/centralizemodecccheck.patch b/centralizemodecccheck.patch
index 25b21d8..58a2c0b 100644
--- a/centralizemodecccheck.patch
+++ b/centralizemodecccheck.patch
@@ -5,9 +5,9 @@ and use that (2x ircd_relay.c, m_wallchops.c, m_wallvoices.c), instead of duplic
 also corrects that an error is returned in WALLVOICES and WALLCHOPS in case +c or +C blocks the message, which is also done for other modes there
 function loops over the text one time to check for control codes or CTCP chars, instead of twice as the old code did
 
-diff -r 833a280b9406 include/channel.h
---- a/include/channel.h	Sat Mar 20 15:42:02 2010 +0100
-+++ b/include/channel.h	Sat Mar 20 17:08:49 2010 +0100
+diff -r e80591f05c47 include/channel.h
+--- a/include/channel.h	Sat Mar 20 17:57:13 2010 +0100
++++ b/include/channel.h	Sat Mar 20 18:16:22 2010 +0100
 @@ -398,6 +398,7 @@
  extern struct Membership* find_channel_member(struct Client* cptr, struct Channel* chptr);
  extern int member_can_send_to_channel(struct Membership* member, int reveal);
@@ -16,9 +16,9 @@ diff -r 833a280b9406 include/channel.h
  
  extern void remove_user_from_channel(struct Client *sptr, struct Channel *chptr);
  extern void remove_user_from_all_channels(struct Client* cptr);
-diff -r 833a280b9406 ircd/channel.c
---- a/ircd/channel.c	Sat Mar 20 15:42:02 2010 +0100
-+++ b/ircd/channel.c	Sat Mar 20 17:08:49 2010 +0100
+diff -r e80591f05c47 ircd/channel.c
+--- a/ircd/channel.c	Sat Mar 20 17:57:13 2010 +0100
++++ b/ircd/channel.c	Sat Mar 20 18:16:22 2010 +0100
 @@ -778,6 +778,48 @@
    return member_can_send_to_channel(member, reveal);
  }
@@ -58,7 +58,7 @@ diff -r 833a280b9406 ircd/channel.c
 +  
 +  /* search for control codes and/or CTCP chars */
 +  for (chr=text;*chr;chr++) {
-+    if ((ctcp && *chr==1) || ((control) && (*chr==2 || *chr==3 || *chr==22 || *chr==27 || *chr==31))) 
++    if ((ctcp && *chr==1) || (control && (*chr==2 || *chr==3 || *chr==22 || *chr==27 || *chr==31))) 
 +      return 0;
 +  }
 +  
@@ -68,9 +68,9 @@ diff -r 833a280b9406 ircd/channel.c
  /** Returns the name of a channel that prevents the user from changing nick.
   * if a member and not (opped or voiced) and (banned or moderated), return
   * the name of the first channel banned on.
-diff -r 833a280b9406 ircd/ircd_relay.c
---- a/ircd/ircd_relay.c	Sat Mar 20 15:42:02 2010 +0100
-+++ b/ircd/ircd_relay.c	Sat Mar 20 17:08:49 2010 +0100
+diff -r e80591f05c47 ircd/ircd_relay.c
+--- a/ircd/ircd_relay.c	Sat Mar 20 17:57:13 2010 +0100
++++ b/ircd/ircd_relay.c	Sat Mar 20 18:16:22 2010 +0100
 @@ -87,7 +87,6 @@
  void relay_channel_message(struct Client* sptr, const char* name, const char* text, const int targetc)
  {
@@ -129,9 +129,9 @@ diff -r 833a280b9406 ircd/ircd_relay.c
  
    if ((chptr->mode.mode & MODE_NOPRIVMSGS) &&
        check_target_limit(sptr, chptr, chptr->chname, 0))
-diff -r 833a280b9406 ircd/m_wallchops.c
---- a/ircd/m_wallchops.c	Sat Mar 20 15:42:02 2010 +0100
-+++ b/ircd/m_wallchops.c	Sat Mar 20 17:08:49 2010 +0100
+diff -r e80591f05c47 ircd/m_wallchops.c
+--- a/ircd/m_wallchops.c	Sat Mar 20 17:57:13 2010 +0100
++++ b/ircd/m_wallchops.c	Sat Mar 20 18:16:22 2010 +0100
 @@ -103,7 +103,6 @@
  {
    struct Channel *chptr;
@@ -164,9 +164,9 @@ diff -r 833a280b9406 ircd/m_wallchops.c
  
        if ((chptr->mode.mode & MODE_NOPRIVMSGS) &&
            check_target_limit(sptr, chptr, chptr->chname, 0))
-diff -r 833a280b9406 ircd/m_wallvoices.c
---- a/ircd/m_wallvoices.c	Sat Mar 20 15:42:02 2010 +0100
-+++ b/ircd/m_wallvoices.c	Sat Mar 20 17:08:49 2010 +0100
+diff -r e80591f05c47 ircd/m_wallvoices.c
+--- a/ircd/m_wallvoices.c	Sat Mar 20 17:57:13 2010 +0100
++++ b/ircd/m_wallvoices.c	Sat Mar 20 18:16:22 2010 +0100
 @@ -102,7 +102,6 @@
  {
    struct Channel *chptr;