irc_string.h -> match.h, irc_string.h; includes changed

diff --git a/extensions/m_adminwall.c b/extensions/m_adminwall.c
index eecf8b5c71b0b2594ebafe2fb6038580f3bd38e0..b37734be60f06d478da857dc6b80279385212572 100644 (file)
--- a/extensions/m_adminwall.c
+++ b/extensions/m_adminwall.c
@@ -27,7 +27,7 @@
 #include "stdinc.h"
 #include "client.h"
 #include "ircd.h"
-#include "irc_string.h"
+#include "match.h"
 #include "numeric.h"
 #include "send.h"
 #include "s_user.h"

diff --git a/extensions/m_findforwards.c b/extensions/m_findforwards.c
index 79bdeea639705653699a9d5cd1be67be155d2d0c..e33ea1786dd65cd5e5c237c0960f693f247de9b8 100644 (file)
--- a/extensions/m_findforwards.c
+++ b/extensions/m_findforwards.c
@@ -23,7 +23,7 @@
 #include "channel.h"
 #include "client.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_user.h"

diff --git a/extensions/m_identify.c b/extensions/m_identify.c
index 76533c2e6c3ea095b96588a421f983e863d5ac05..c3f1100984f4e480cb0f5feed397015dfdd66b00 100644 (file)
--- a/extensions/m_identify.c
+++ b/extensions/m_identify.c
@@ -35,7 +35,7 @@
 #include "client.h"
 #include "common.h"
 #include "ircd.h"
-#include "irc_string.h"
+#include "match.h"
 #include "numeric.h"
 #include "s_conf.h"
 #include "logger.h"

diff --git a/extensions/m_mkpasswd.c b/extensions/m_mkpasswd.c
index 804ae211675a2216c8f28c43c46679b28d8a48d9..242b06673433f31cd288401bfb73c1fb736eda75 100644 (file)
--- a/extensions/m_mkpasswd.c
+++ b/extensions/m_mkpasswd.c
@@ -14,7 +14,7 @@
 #include "client.h"
 #include "common.h"            /* FALSE bleah */
 #include "ircd.h"
-#include "irc_string.h"
+#include "match.h"
 #include "numeric.h"
 #include "s_newconf.h"
 #include "s_conf.h"

diff --git a/extensions/m_ojoin.c b/extensions/m_ojoin.c
index 53ed832ff6d14b330aa838a6636644655d7d3036..96efcad9515891912c88dff11a90a7cb1378aa07 100644 (file)
--- a/extensions/m_ojoin.c
+++ b/extensions/m_ojoin.c
@@ -30,7 +30,7 @@
 #include "s_newconf.h" 
 #include "send.h"
 #include "whowas.h"
-#include "irc_string.h"
+#include "match.h"
 #include "hash.h" 
 #include "msg.h"
 #include "parse.h"

diff --git a/extensions/m_okick.c b/extensions/m_okick.c
index 156a046e1e0d4672e919b56d6b3e31f0e7b9d070..add1648c152e7da651b59d14eceef6e900204c3e 100644 (file)
--- a/extensions/m_okick.c
+++ b/extensions/m_okick.c
@@ -26,7 +26,7 @@
 #include "stdinc.h"
 #include "channel.h"
 #include "client.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"

diff --git a/extensions/m_olist.c b/extensions/m_olist.c
index cccb011ab6df3e3b02433f72686924e06196fefd..4484ae5b1f0d3773f4b3dbb09040ac5cfa730e2c 100644 (file)
--- a/extensions/m_olist.c
+++ b/extensions/m_olist.c
@@ -35,7 +35,7 @@
 #include "s_serv.h"
 #include "send.h"
 #include "whowas.h"
-#include "irc_string.h"
+#include "match.h"
 #include "hash.h"
 #include "msg.h"
 #include "parse.h"

diff --git a/extensions/m_omode.c b/extensions/m_omode.c
index cb2b0d39e6be5567dbb29d25c37c82ba1f4192ad..f1407ffd186948f9e9104514d5c4bafa47ca4e73 100644 (file)
--- a/extensions/m_omode.c
+++ b/extensions/m_omode.c
@@ -29,7 +29,7 @@
 #include "channel.h"
 #include "client.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_user.h"

diff --git a/extensions/m_opme.c b/extensions/m_opme.c
index f75f16552440dca928529ffff9fd7cca96c22e10..e23d6c760e0f4418ac543956776ec6756978967c 100644 (file)
--- a/extensions/m_opme.c
+++ b/extensions/m_opme.c
@@ -27,7 +27,7 @@
 #include "s_serv.h"
 #include "send.h"
 #include "whowas.h"
-#include "irc_string.h"
+#include "match.h"
 #include "hash.h"
 #include "msg.h"
 #include "parse.h"

diff --git a/extensions/m_webirc.c b/extensions/m_webirc.c
index bec61e9eec0e6fdaffefa3538719363c1558c0d3..8d2f2390194bf8cb2cb3c13c7bbca1b1dd188909 100644 (file)
--- a/extensions/m_webirc.c
+++ b/extensions/m_webirc.c
@@ -42,7 +42,7 @@
 
 #include "stdinc.h"
 #include "client.h"            /* client struct */
-#include "irc_string.h"
+#include "match.h"
 #include "hostmask.h"
 #include "send.h"              /* sendto_one */
 #include "numeric.h"           /* ERR_xxx */

diff --git a/include/client.h b/include/client.h
index 130f19207e349dd5fff3d0d369e8d37dc4cc74ee..1b934e76480d0214744f397fd0a33d40cf055fa8 100644 (file)
--- a/include/client.h
+++ b/include/client.h
@@ -38,7 +38,7 @@
 #include "channel.h"
 #include "res.h"
 #include "snomask.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 
 /* other structs */

diff --git a/include/irc_string.h b/include/irc_string.h
index 63548450a8f5b041c1c6a3b1974cafbf0fa3f7df..d529fc8a5f2b00ef344e379c3eddb4bdc8934b4c 100644 (file)
--- a/include/irc_string.h
+++ b/include/irc_string.h
@@ -27,122 +27,10 @@
 #ifndef INCLUDED_irc_string_h
 #define INCLUDED_irc_string_h
 
-#include "setup.h"
-#include "ircd_defs.h"
-
-/*
- * match - compare name with mask, mask may contain * and ? as wildcards
- * match - returns 1 on successful match, 0 otherwise
- *
- * mask_match - compare one mask to another
- * match_esc - compare with support for escaping chars
- * match_cidr - compares u!h@addr with u!h@addr/cidr
- * match_ips - compares addr with addr/cidr in ascii form
- */
-extern int match(const char *mask, const char *name);
-extern int mask_match(const char *oldmask, const char *newmask);
-extern int match_esc(const char *mask, const char *name);
-extern int match_cidr(const char *mask, const char *name);
-extern int match_ips(const char *mask, const char *name);
-
-/*
- * comp_with_mask - compares to IP address
- */
-int comp_with_mask(void *addr, void *dest, u_int mask);
-int comp_with_mask_sock(struct sockaddr *addr, struct sockaddr *dest, u_int mask);
-
-/*
- * collapse - collapse a string in place, converts multiple adjacent *'s 
- * into a single *.
- * collapse - modifies the contents of pattern 
- *
- * collapse_esc() - collapse with support for escaping chars
- */
-extern char *collapse(char *pattern);
-extern char *collapse_esc(char *pattern);
-
-/*
- * irccmp - case insensitive comparison of s1 and s2
- */
-extern int irccmp(const char *s1, const char *s2);
-/*
- * ircncmp - counted case insensitive comparison of s1 and s2
- */
-extern int ircncmp(const char *s1, const char *s2, int n);
-/*
-** canonize - reduce a string of duplicate list entries to contain
-** only the unique items.
-*/
-#ifdef NO_DUPE_MULTI_MESSAGES
-extern char *canonize(char *);
-#endif
-
 /*
  * strip_colour - remove colour codes from a string
  * -asuffield (?)
  */
 char *strip_colour(char *string);
 
-#define EmptyString(x) ((x) == NULL || *(x) == '\0')
-#define CheckEmpty(x) EmptyString(x) ? "" : x
-
-/*
- * character macros
- */
-extern const unsigned char ToLowerTab[];
-#define ToLower(c) (ToLowerTab[(unsigned char)(c)])
-
-extern const unsigned char ToUpperTab[];
-#define ToUpper(c) (ToUpperTab[(unsigned char)(c)])
-
-extern const unsigned int CharAttrs[];
-
-#define PRINT_C   0x001
-#define CNTRL_C   0x002
-#define ALPHA_C   0x004
-#define PUNCT_C   0x008
-#define DIGIT_C   0x010
-#define SPACE_C   0x020
-#define NICK_C    0x040
-#define CHAN_C    0x080
-#define KWILD_C   0x100
-#define CHANPFX_C 0x200
-#define USER_C    0x400
-#define HOST_C    0x800
-#define NONEOS_C 0x1000
-#define SERV_C   0x2000
-#define EOL_C    0x4000
-#define MWILD_C  0x8000
-#define LET_C   0x10000 /* an actual letter */
-#define FCHAN_C 0x20000 /* a 'fake' channel char */
-
-#define IsHostChar(c)   (CharAttrs[(unsigned char)(c)] & HOST_C)
-#define IsUserChar(c)   (CharAttrs[(unsigned char)(c)] & USER_C)
-#define IsChanPrefix(c) (CharAttrs[(unsigned char)(c)] & CHANPFX_C)
-#define IsChanChar(c)   (CharAttrs[(unsigned char)(c)] & CHAN_C)
-#define IsFakeChanChar(c)      (CharAttrs[(unsigned char)(c)] & FCHAN_C)
-#define IsKWildChar(c)  (CharAttrs[(unsigned char)(c)] & KWILD_C)
-#define IsMWildChar(c)  (CharAttrs[(unsigned char)(c)] & MWILD_C)
-#define IsNickChar(c)   (CharAttrs[(unsigned char)(c)] & NICK_C)
-#define IsServChar(c)   (CharAttrs[(unsigned char)(c)] & (NICK_C | SERV_C))
-#define IsIdChar(c)    (CharAttrs[(unsigned char)(c)] & (DIGIT_C | LET_C))
-#define IsLetter(c)    (CharAttrs[(unsigned char)(c)] & LET_C)
-#define IsCntrl(c)      (CharAttrs[(unsigned char)(c)] & CNTRL_C)
-#define IsAlpha(c)      (CharAttrs[(unsigned char)(c)] & ALPHA_C)
-#define IsSpace(c)      (CharAttrs[(unsigned char)(c)] & SPACE_C)
-#define IsLower(c)      (IsAlpha((c)) && ((unsigned char)(c) > 0x5f))
-#define IsUpper(c)      (IsAlpha((c)) && ((unsigned char)(c) < 0x60))
-#define IsDigit(c)      (CharAttrs[(unsigned char)(c)] & DIGIT_C)
-#define IsXDigit(c) (IsDigit(c) || ('a' <= (c) && (c) <= 'f') || \
-        ('A' <= (c) && (c) <= 'F'))
-#define IsAlNum(c) (CharAttrs[(unsigned char)(c)] & (DIGIT_C | ALPHA_C))
-#define IsPrint(c) (CharAttrs[(unsigned char)(c)] & PRINT_C)
-#define IsAscii(c) ((unsigned char)(c) < 0x80)
-#define IsGraph(c) (IsPrint((c)) && ((unsigned char)(c) != 0x32))
-#define IsPunct(c) (!(CharAttrs[(unsigned char)(c)] & \
-                                           (CNTRL_C | ALPHA_C | DIGIT_C)))
-
-#define IsNonEOS(c) (CharAttrs[(unsigned char)(c)] & NONEOS_C)
-#define IsEol(c) (CharAttrs[(unsigned char)(c)] & EOL_C)
-
 #endif /* INCLUDED_irc_string_h */

diff --git a/include/match.h b/include/match.h
new file mode 100644 (file)
index 0000000..da6f781
--- /dev/null
+++ b/include/match.h
@@ -0,0 +1,142 @@
+/*
+ *  ircd-ratbox: A slightly useful ircd.
+ *  irc_string.h: A header for the ircd string functions.
+ *
+ *  Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
+ *  Copyright (C) 1996-2002 Hybrid Development Team
+ *  Copyright (C) 2002-2004 ircd-ratbox development team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ *  USA
+ *
+ *  $Id: irc_string.h 3538 2007-07-26 14:21:57Z jilles $
+ */
+
+#ifndef INCLUDED_match_h
+#define INCLUDED_match_h
+
+#include "setup.h"
+#include "ircd_defs.h"
+
+/*
+ * match - compare name with mask, mask may contain * and ? as wildcards
+ * match - returns 1 on successful match, 0 otherwise
+ *
+ * mask_match - compare one mask to another
+ * match_esc - compare with support for escaping chars
+ * match_cidr - compares u!h@addr with u!h@addr/cidr
+ * match_ips - compares addr with addr/cidr in ascii form
+ */
+extern int match(const char *mask, const char *name);
+extern int mask_match(const char *oldmask, const char *newmask);
+extern int match_esc(const char *mask, const char *name);
+extern int match_cidr(const char *mask, const char *name);
+extern int match_ips(const char *mask, const char *name);
+
+/*
+ * comp_with_mask - compares to IP address
+ */
+int comp_with_mask(void *addr, void *dest, u_int mask);
+int comp_with_mask_sock(struct sockaddr *addr, struct sockaddr *dest, u_int mask);
+
+/*
+ * collapse - collapse a string in place, converts multiple adjacent *'s 
+ * into a single *.
+ * collapse - modifies the contents of pattern 
+ *
+ * collapse_esc() - collapse with support for escaping chars
+ */
+extern char *collapse(char *pattern);
+extern char *collapse_esc(char *pattern);
+
+/*
+ * irccmp - case insensitive comparison of s1 and s2
+ */
+extern int irccmp(const char *s1, const char *s2);
+/*
+ * ircncmp - counted case insensitive comparison of s1 and s2
+ */
+extern int ircncmp(const char *s1, const char *s2, int n);
+/*
+** canonize - reduce a string of duplicate list entries to contain
+** only the unique items.
+*/
+#ifdef NO_DUPE_MULTI_MESSAGES
+extern char *canonize(char *);
+#endif
+
+#define EmptyString(x) ((x) == NULL || *(x) == '\0')
+#define CheckEmpty(x) EmptyString(x) ? "" : x
+
+/*
+ * character macros
+ */
+extern const unsigned char ToLowerTab[];
+#define ToLower(c) (ToLowerTab[(unsigned char)(c)])
+
+extern const unsigned char ToUpperTab[];
+#define ToUpper(c) (ToUpperTab[(unsigned char)(c)])
+
+extern const unsigned int CharAttrs[];
+
+#define PRINT_C   0x001
+#define CNTRL_C   0x002
+#define ALPHA_C   0x004
+#define PUNCT_C   0x008
+#define DIGIT_C   0x010
+#define SPACE_C   0x020
+#define NICK_C    0x040
+#define CHAN_C    0x080
+#define KWILD_C   0x100
+#define CHANPFX_C 0x200
+#define USER_C    0x400
+#define HOST_C    0x800
+#define NONEOS_C 0x1000
+#define SERV_C   0x2000
+#define EOL_C    0x4000
+#define MWILD_C  0x8000
+#define LET_C   0x10000 /* an actual letter */
+#define FCHAN_C 0x20000 /* a 'fake' channel char */
+
+#define IsHostChar(c)   (CharAttrs[(unsigned char)(c)] & HOST_C)
+#define IsUserChar(c)   (CharAttrs[(unsigned char)(c)] & USER_C)
+#define IsChanPrefix(c) (CharAttrs[(unsigned char)(c)] & CHANPFX_C)
+#define IsChanChar(c)   (CharAttrs[(unsigned char)(c)] & CHAN_C)
+#define IsFakeChanChar(c)      (CharAttrs[(unsigned char)(c)] & FCHAN_C)
+#define IsKWildChar(c)  (CharAttrs[(unsigned char)(c)] & KWILD_C)
+#define IsMWildChar(c)  (CharAttrs[(unsigned char)(c)] & MWILD_C)
+#define IsNickChar(c)   (CharAttrs[(unsigned char)(c)] & NICK_C)
+#define IsServChar(c)   (CharAttrs[(unsigned char)(c)] & (NICK_C | SERV_C))
+#define IsIdChar(c)    (CharAttrs[(unsigned char)(c)] & (DIGIT_C | LET_C))
+#define IsLetter(c)    (CharAttrs[(unsigned char)(c)] & LET_C)
+#define IsCntrl(c)      (CharAttrs[(unsigned char)(c)] & CNTRL_C)
+#define IsAlpha(c)      (CharAttrs[(unsigned char)(c)] & ALPHA_C)
+#define IsSpace(c)      (CharAttrs[(unsigned char)(c)] & SPACE_C)
+#define IsLower(c)      (IsAlpha((c)) && ((unsigned char)(c) > 0x5f))
+#define IsUpper(c)      (IsAlpha((c)) && ((unsigned char)(c) < 0x60))
+#define IsDigit(c)      (CharAttrs[(unsigned char)(c)] & DIGIT_C)
+#define IsXDigit(c) (IsDigit(c) || ('a' <= (c) && (c) <= 'f') || \
+        ('A' <= (c) && (c) <= 'F'))
+#define IsAlNum(c) (CharAttrs[(unsigned char)(c)] & (DIGIT_C | ALPHA_C))
+#define IsPrint(c) (CharAttrs[(unsigned char)(c)] & PRINT_C)
+#define IsAscii(c) ((unsigned char)(c) < 0x80)
+#define IsGraph(c) (IsPrint((c)) && ((unsigned char)(c) != 0x32))
+#define IsPunct(c) (!(CharAttrs[(unsigned char)(c)] & \
+                                           (CNTRL_C | ALPHA_C | DIGIT_C)))
+
+#define IsNonEOS(c) (CharAttrs[(unsigned char)(c)] & NONEOS_C)
+#define IsEol(c) (CharAttrs[(unsigned char)(c)] & EOL_C)
+
+#endif /* INCLUDED_match_h */

diff --git a/include/res.h b/include/res.h
index 84d70e562164383405ed5522a42c5e218ce5ccfa..1b70094d9a7218b719a13adc3916da8e29ff3449 100644 (file)
--- a/include/res.h
+++ b/include/res.h
@@ -10,7 +10,7 @@
 #include "ircd_defs.h"
 #include "common.h"
 #include "reslib.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 
 /* Maximum number of nameservers in /etc/resolv.conf we care about 

diff --git a/modules/core/m_die.c b/modules/core/m_die.c
index 0ef29037a775e99cf6684cf87a5b01186dd94f47..e8aa279ee354d05c89a0eb6fc66406b292aff7c6 100644 (file)
--- a/modules/core/m_die.c
+++ b/modules/core/m_die.c
@@ -27,7 +27,7 @@
 #include "stdinc.h"
 #include "client.h"
 #include "ircd.h"
-#include "irc_string.h"
+#include "match.h"
 #include "numeric.h"
 #include "logger.h"
 #include "s_conf.h"

diff --git a/modules/core/m_join.c b/modules/core/m_join.c
index 48c8752638d9b337203793939bc57b14bac50ce5..3b43683f0da0ff84c13e8c738626abbf50d79626 100644 (file)
--- a/modules/core/m_join.c
+++ b/modules/core/m_join.c
@@ -29,7 +29,7 @@
 #include "client.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"

diff --git a/modules/core/m_kick.c b/modules/core/m_kick.c
index edec515f38e10c3d19b0359aa0b588ef22909a49..a7d5e2a7399ef83f17180af32bbe9e0c6ecffd5d 100644 (file)
--- a/modules/core/m_kick.c
+++ b/modules/core/m_kick.c
@@ -27,7 +27,7 @@
 #include "stdinc.h"
 #include "channel.h"
 #include "client.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"

diff --git a/modules/core/m_kill.c b/modules/core/m_kill.c
index 5fb4b4cfa8c028b26f9fb7f45fb353d821010d8d..ad286d5c5c3896d358c0c8b88ca854f85d3881a0 100644 (file)
--- a/modules/core/m_kill.c
+++ b/modules/core/m_kill.c
@@ -34,7 +34,7 @@
 #include "s_conf.h"
 #include "send.h"
 #include "whowas.h"
-#include "irc_string.h"
+#include "match.h"
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"

diff --git a/modules/core/m_message.c b/modules/core/m_message.c
index f559719ccf8a02f5ba9d89e64705647f42e62d55..b934b3e362644ada6d8a38019ab2d3042068ab9d 100644 (file)
--- a/modules/core/m_message.c
+++ b/modules/core/m_message.c
@@ -35,7 +35,7 @@
 #include "parse.h"
 #include "modules.h"
 #include "channel.h"
-#include "irc_string.h"
+#include "match.h"
 #include "hash.h"
 #include "class.h"
 #include "msg.h"
@@ -43,6 +43,7 @@
 #include "send.h"
 #include "s_newconf.h"
 #include "s_stats.h"
+#include "irc_string.h"
 
 static int m_message(int, const char *, struct Client *, struct Client *, int, const char **);
 static int m_privmsg(struct Client *, struct Client *, int, const char **);

diff --git a/modules/core/m_mode.c b/modules/core/m_mode.c
index 32b9127d92edf282cf066bdec051e0f44dbf7320..1653b09b6176183598eccec05ec01dd4e57c1707 100644 (file)
--- a/modules/core/m_mode.c
+++ b/modules/core/m_mode.c
@@ -28,7 +28,7 @@
 #include "channel.h"
 #include "client.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_user.h"

diff --git a/modules/core/m_nick.c b/modules/core/m_nick.c
index dd827b8201cf4d91f951a648c9c82c8692f4142f..352de58087ffc3475258829ed0e8a29f3b7c2cfc 100644 (file)
--- a/modules/core/m_nick.c
+++ b/modules/core/m_nick.c
@@ -27,7 +27,7 @@
 #include "stdinc.h"
 #include "client.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_conf.h"

diff --git a/modules/core/m_part.c b/modules/core/m_part.c
index 9e72ebc2d14f309ce3849dbcb8625b8f3f830f29..9b48020dc21fae48909ce169ff71af18f0c8a324 100644 (file)
--- a/modules/core/m_part.c
+++ b/modules/core/m_part.c
@@ -29,7 +29,7 @@
 #include "client.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"
@@ -39,6 +39,7 @@
 #include "modules.h"
 #include "s_conf.h"
 #include "packet.h"
+#include "irc_string.h"
 
 static int m_part(struct Client *, struct Client *, int, const char **);
 

diff --git a/modules/core/m_quit.c b/modules/core/m_quit.c
index 014d472bc2629c4909ea08daedf62d05c0c32c6e..346c49f0f1261c8c7cef1fde292c3ad81d78c193 100644 (file)
--- a/modules/core/m_quit.c
+++ b/modules/core/m_quit.c
@@ -34,6 +34,7 @@
 #include "parse.h"
 #include "modules.h"
 #include "s_conf.h"
+#include "irc_string.h"
 
 static int m_quit(struct Client *, struct Client *, int, const char **);
 static int ms_quit(struct Client *, struct Client *, int, const char **);

diff --git a/modules/core/m_server.c b/modules/core/m_server.c
index 0c90e62a10233ac96ff8d5505e346052b7310665..f483509038e37b0b2019ef03194b4bf29a35bfc7 100644 (file)
--- a/modules/core/m_server.c
+++ b/modules/core/m_server.c
@@ -28,7 +28,7 @@
 #include "client.h"            /* client struct */
 #include "common.h"            /* TRUE bleah */
 #include "hash.h"              /* add_to_client_hash */
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"              /* me */
 #include "numeric.h"           /* ERR_xxx */
 #include "s_conf.h"            /* struct ConfItem */

diff --git a/modules/core/m_squit.c b/modules/core/m_squit.c
index 67e939e9d0ad901f616f777d3ec7368714186863..9a2c2b759a4dc4821c23fe028556501d857e87a9 100644 (file)
--- a/modules/core/m_squit.c
+++ b/modules/core/m_squit.c
@@ -27,7 +27,7 @@
 #include "stdinc.h"
 #include "client.h"
 #include "common.h"            /* FALSE bleah */
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_conf.h"

diff --git a/modules/m_away.c b/modules/m_away.c
index 6b3500874aab6feb8ceb843871f3c4bad9e6fe5e..cd4c89bdb4d1e79e4aacd59d5bc6a0ffc8c0bd98 100644 (file)
--- a/modules/m_away.c
+++ b/modules/m_away.c
@@ -26,7 +26,7 @@
 
 #include "stdinc.h"
 #include "client.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"

diff --git a/modules/m_cap.c b/modules/m_cap.c
index 998d8f0d1966cd597543a925aa80e7cec62c2ce5..9fa94d37c9449e1446029bf534a74e19d961af05 100644 (file)
--- a/modules/m_cap.c
+++ b/modules/m_cap.c
@@ -33,7 +33,7 @@
 #include "stdinc.h"
 #include "class.h"
 #include "client.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "msg.h"

diff --git a/modules/m_capab.c b/modules/m_capab.c
index 58901fb8df222be0a4ae6bb0c3dfc4a778c7362a..3bc93724ac84126c525abb7359e31ce149332b15 100644 (file)
--- a/modules/m_capab.c
+++ b/modules/m_capab.c
@@ -26,7 +26,7 @@
 
 #include "stdinc.h"
 #include "client.h"
-#include "irc_string.h"
+#include "match.h"
 #include "s_serv.h"
 #include "s_conf.h"
 #include "msg.h"

diff --git a/modules/m_challenge.c b/modules/m_challenge.c
index 0d2278e4bbd275c74d580176423b3e24b6505eec..ea7c1280e02598e7168e2457fcef74366ae7ecfe 100644 (file)
--- a/modules/m_challenge.c
+++ b/modules/m_challenge.c
@@ -44,7 +44,7 @@
 #include "s_conf.h"
 #include "msg.h"
 #include "parse.h"
-#include "irc_string.h"
+#include "match.h"
 #include "logger.h"
 #include "s_user.h"
 #include "cache.h"

diff --git a/modules/m_connect.c b/modules/m_connect.c
index deb83b8d93438bc47a4f21f5a52c6edc466b226b..9f586b49dbdeb4e858c5530c051f80c5efbfc5a5 100644 (file)
--- a/modules/m_connect.c
+++ b/modules/m_connect.c
@@ -27,7 +27,7 @@
 #include "stdinc.h"
 #include "client.h"
 #include "ircd.h"
-#include "irc_string.h"
+#include "match.h"
 #include "numeric.h"
 #include "s_conf.h"
 #include "s_newconf.h"

diff --git a/modules/m_dline.c b/modules/m_dline.c
index 6ca3da841f4f026e70a8b16b60ee9de232792754..97e0aa65733dde61e70855c47bdbaf1573e12f69 100644 (file)
--- a/modules/m_dline.c
+++ b/modules/m_dline.c
@@ -29,7 +29,7 @@
 #include "class.h"
 #include "client.h"
 #include "common.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "hostmask.h"
 #include "numeric.h"

diff --git a/modules/m_etrace.c b/modules/m_etrace.c
index 9e2998dabf7051965402b328c348e61c787a8704..35e93c1f4597087788f12afa80739be14a50f891 100644 (file)
--- a/modules/m_etrace.c
+++ b/modules/m_etrace.c
@@ -39,7 +39,7 @@
 #include "hash.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_serv.h"

diff --git a/modules/m_info.c b/modules/m_info.c
index 470ded5aa0369e3d567dfbd9308c92f170c85b92..870fe1219ca89be80f3ecd324ec3b6d8a92ce323 100644 (file)
--- a/modules/m_info.c
+++ b/modules/m_info.c
@@ -29,7 +29,7 @@
 #include "channel.h"
 #include "client.h"
 #include "common.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "hook.h"
 #include "numeric.h"

diff --git a/modules/m_invite.c b/modules/m_invite.c
index eb6c0414824fd94f588b961883f3d051c2c4e7a7..04e04f061f9a5ba1bc6b8c6a808d3d18235955ff 100644 (file)
--- a/modules/m_invite.c
+++ b/modules/m_invite.c
@@ -29,7 +29,7 @@
 #include "channel.h"
 #include "client.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"

diff --git a/modules/m_ison.c b/modules/m_ison.c
index bcd7d943d60f1ba1887e73b8322de2500bb131eb..d918b7bf22693b2ceaa2a5a8307d4dfc49f360ff 100644 (file)
--- a/modules/m_ison.c
+++ b/modules/m_ison.c
@@ -26,7 +26,7 @@
 
 #include "stdinc.h"
 #include "client.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"

diff --git a/modules/m_kline.c b/modules/m_kline.c
index 1dad6d9a5d782d8ec67c6159918c9f9c984e393a..51579613aa8cab91a4c1213f4b641bd13ade2726 100644 (file)
--- a/modules/m_kline.c
+++ b/modules/m_kline.c
@@ -29,7 +29,7 @@
 #include "class.h"
 #include "client.h"
 #include "common.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "hostmask.h"
 #include "numeric.h"

diff --git a/modules/m_knock.c b/modules/m_knock.c
index 2c786e09e7ae83d497948de28f213c5142980d97..958951d3a5c8ee3e721b32207fc8d36750a537a0 100644 (file)
--- a/modules/m_knock.c
+++ b/modules/m_knock.c
@@ -27,7 +27,7 @@
 #include "channel.h"
 #include "client.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"

diff --git a/modules/m_links.c b/modules/m_links.c
index 75598a75478065ff625ce6577300923ec56669ee..e4a0f881142b8bedd2f8b59992bcce4ec476cbfe 100644 (file)
--- a/modules/m_links.c
+++ b/modules/m_links.c
@@ -26,7 +26,7 @@
 
 #include "stdinc.h"
 #include "client.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_serv.h"

diff --git a/modules/m_list.c b/modules/m_list.c
index e6aaff4ebbd31c167206cfaf153eaf076e45df38..db397a2b782dc68c225b00f10665a10b976f3c1f 100644 (file)
--- a/modules/m_list.c
+++ b/modules/m_list.c
@@ -37,7 +37,7 @@
 #include "channel.h"
 #include "client.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_conf.h"

diff --git a/modules/m_locops.c b/modules/m_locops.c
index 96681e0896474d2492b829dee0e41bfddad74681..bf2e01447ed9648157b13abe7bc45f4d2178e776 100644 (file)
--- a/modules/m_locops.c
+++ b/modules/m_locops.c
@@ -27,7 +27,7 @@
 #include "stdinc.h"
 #include "client.h"
 #include "ircd.h"
-#include "irc_string.h"
+#include "match.h"
 #include "numeric.h"
 #include "send.h"
 #include "s_user.h"

diff --git a/modules/m_names.c b/modules/m_names.c
index d3c7024978e29fc3f35f1807b2532031430864de..76425fe740cda738d6b07f1b0e12ca5c57e2e776 100644 (file)
--- a/modules/m_names.c
+++ b/modules/m_names.c
@@ -29,7 +29,7 @@
 #include "client.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"

diff --git a/modules/m_oper.c b/modules/m_oper.c
index 886da7cc4c0f89e610193736f12ed8088a41deee..ca5c2120794cd2dfb0e3dabf18e13f164aa0fbaf 100644 (file)
--- a/modules/m_oper.c
+++ b/modules/m_oper.c
@@ -27,7 +27,7 @@
 #include "stdinc.h"
 #include "client.h"
 #include "common.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_conf.h"

diff --git a/modules/m_pass.c b/modules/m_pass.c
index 6ef11a8e59ce311fd916df0fbbb0c628e3686c26..1f4255e26eb379b9d4a2c0e63dd49720231fed6a 100644 (file)
--- a/modules/m_pass.c
+++ b/modules/m_pass.c
@@ -26,7 +26,7 @@
 
 #include "stdinc.h"
 #include "client.h"            /* client struct */
-#include "irc_string.h"
+#include "match.h"
 #include "send.h"              /* sendto_one */
 #include "numeric.h"           /* ERR_xxx */
 #include "ircd.h"              /* me */

diff --git a/modules/m_ping.c b/modules/m_ping.c
index f2a0be3e5812dadb40bcb8105db56220e2a507d5..6269c54ee931457c1b213fe14371df5f7aa2d2e4 100644 (file)
--- a/modules/m_ping.c
+++ b/modules/m_ping.c
@@ -29,7 +29,7 @@
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"
-#include "irc_string.h"
+#include "match.h"
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"

diff --git a/modules/m_pong.c b/modules/m_pong.c
index 7cf84d5a7980701f50c20e242c65c692a31f42c8..e5fb98e0a529483555a5eac8dc7b04eac1b9f2fd 100644 (file)
--- a/modules/m_pong.c
+++ b/modules/m_pong.c
@@ -34,7 +34,7 @@
 #include "s_conf.h"
 #include "send.h"
 #include "channel.h"
-#include "irc_string.h"
+#include "match.h"
 #include "msg.h"
 #include "parse.h"
 #include "hash.h"

diff --git a/modules/m_rehash.c b/modules/m_rehash.c
index ff0a08a1467bcc8c11806790880ea7047ffd1762..8bddf18ef4a14f716d7521ab9677d7384de89ae7 100644 (file)
--- a/modules/m_rehash.c
+++ b/modules/m_rehash.c
@@ -28,7 +28,7 @@
 #include "client.h"
 #include "channel.h"
 #include "common.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "s_serv.h"
 #include "numeric.h"

diff --git a/modules/m_restart.c b/modules/m_restart.c
index 97f47db037afb55ab0cc66ea76567ca28cd09ede..e175e9d991070ab2269d5d4d9b2dd483bf71186a 100644 (file)
--- a/modules/m_restart.c
+++ b/modules/m_restart.c
@@ -27,7 +27,7 @@
 #include "stdinc.h"
 #include "client.h"
 #include "common.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_conf.h"

diff --git a/modules/m_scan.c b/modules/m_scan.c
index ecb10e9d0062cab61aa9b5bf8861461897608505..23a64b35291c50a5f885c6aabb43d9157dc580c7 100644 (file)
--- a/modules/m_scan.c
+++ b/modules/m_scan.c
@@ -38,7 +38,7 @@
 #include "hash.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_serv.h"

diff --git a/modules/m_set.c b/modules/m_set.c
index e9d7f0a439af70758239b31221754e052b157df5..dfa7a8e456303dc09a1d50088317e7d5040e145e 100644 (file)
--- a/modules/m_set.c
+++ b/modules/m_set.c
@@ -28,7 +28,7 @@
 
 #include "stdinc.h"
 #include "client.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_serv.h"

diff --git a/modules/m_signon.c b/modules/m_signon.c
index b0503434a1155d8c68dc396f2088d51eb8fc3de3..51d797148c7411cb332369f15ac94646890e2bf9 100644 (file)
--- a/modules/m_signon.c
+++ b/modules/m_signon.c
@@ -48,7 +48,7 @@
 #include "monitor.h"
 #include "s_stats.h"
 #include "snomask.h"
-#include "irc_string.h"
+#include "match.h"
 #include "s_user.h"
 
 static int me_svslogin(struct Client *, struct Client *, int, const char **);

diff --git a/modules/m_snote.c b/modules/m_snote.c
index 785901e4031f81616424ec1fe83a0b535b47b4ac..2ab7f7b33b86902d4bd040907992532c9b438ced 100644 (file)
--- a/modules/m_snote.c
+++ b/modules/m_snote.c
@@ -38,7 +38,7 @@
 #include "hash.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_serv.h"

diff --git a/modules/m_stats.c b/modules/m_stats.c
index ce73a7b936960ed5aa68c147e0ce6c06a9ec6d56..8e3d1d29bee87910a28f8a3aba1e5bd091510724 100644 (file)
--- a/modules/m_stats.c
+++ b/modules/m_stats.c
@@ -28,7 +28,7 @@
 #include "class.h"             /* report_classes */
 #include "client.h"            /* Client */
 #include "common.h"            /* TRUE/FALSE */
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"              /* me */
 #include "listener.h"          /* show_ports */
 #include "msg.h"               /* Message */

diff --git a/modules/m_svinfo.c b/modules/m_svinfo.c
index a6b48482c233b3da93408a39fe3f756671a5649d..6f7f3267703aa11cb068d5ae64f755507dd40d72 100644 (file)
--- a/modules/m_svinfo.c
+++ b/modules/m_svinfo.c
@@ -26,7 +26,7 @@
 #include "stdinc.h"
 #include "client.h"
 #include "common.h"            /* TRUE bleah */
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"

diff --git a/modules/m_tb.c b/modules/m_tb.c
index 875713e901ae8ed003a4a6a2779eeca2806e1441..ddc2245988ad0bcd5bb1d3fdee00c1a9bb2dd584 100644 (file)
--- a/modules/m_tb.c
+++ b/modules/m_tb.c
@@ -37,7 +37,7 @@
 #include "common.h"
 #include "config.h"
 #include "ircd.h"
-#include "irc_string.h"
+#include "match.h"
 #include "s_conf.h"
 #include "msg.h"
 #include "modules.h"

diff --git a/modules/m_testmask.c b/modules/m_testmask.c
index 089f5e9fac4ae85f5b47586d6995691258401316..373193df9782a1dfdc2c3eb1c410bd4ee983bb0d 100644 (file)
--- a/modules/m_testmask.c
+++ b/modules/m_testmask.c
@@ -38,7 +38,7 @@
 #include "client.h"
 #include "common.h"     /* FALSE bleah */
 #include "ircd.h"
-#include "irc_string.h"
+#include "match.h"
 #include "numeric.h"
 #include "s_conf.h"
 #include "logger.h"

diff --git a/modules/m_topic.c b/modules/m_topic.c
index bc2bc1686032ed7e4f5ec7fe1b1121b7fdf560f8..9c9117014272cce788b174cd79c4d0ad2fc2f606 100644 (file)
--- a/modules/m_topic.c
+++ b/modules/m_topic.c
@@ -28,7 +28,7 @@
 #include "channel.h"
 #include "client.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"

diff --git a/modules/m_trace.c b/modules/m_trace.c
index 8d13159696fa7865c6fe072440827b00d96616ef..2c8b9831c7f3cf3c8826d7d20b7bc8d9d71ac251 100644 (file)
--- a/modules/m_trace.c
+++ b/modules/m_trace.c
@@ -31,7 +31,7 @@
 #include "hash.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_serv.h"

diff --git a/modules/m_user.c b/modules/m_user.c
index 94a6577d2fef75a8006c1c80ebd57d2d073431bc..2f792a7b7f1f30ced69427a2b7ec195e5b7ae268 100644 (file)
--- a/modules/m_user.c
+++ b/modules/m_user.c
@@ -26,7 +26,7 @@
 
 #include "stdinc.h"
 #include "client.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_user.h"

diff --git a/modules/m_userhost.c b/modules/m_userhost.c
index 964aa6b9ea7f259a150603d7439d0beb65163b29..c819764e2f5dae2d9895eb2b68e16c99aa2fb2fe 100644 (file)
--- a/modules/m_userhost.c
+++ b/modules/m_userhost.c
@@ -30,7 +30,7 @@
 #include "numeric.h"
 #include "s_serv.h"
 #include "send.h"
-#include "irc_string.h"
+#include "match.h"
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"

diff --git a/modules/m_wallops.c b/modules/m_wallops.c
index ccd25e91a21c89776963c5f06162a8a0a8b04e6e..f468bff98a15d76a62ed301506d8f8631f33c448 100644 (file)
--- a/modules/m_wallops.c
+++ b/modules/m_wallops.c
@@ -27,7 +27,7 @@
 #include "stdinc.h"
 #include "client.h"
 #include "ircd.h"
-#include "irc_string.h"
+#include "match.h"
 #include "numeric.h"
 #include "send.h"
 #include "s_user.h"

diff --git a/modules/m_who.c b/modules/m_who.c
index 749d35f1a1afeaa058d54182ee1e5238578f08b2..b0b76f56d5b13452729e22ff4cd714e8c7a30e6b 100644 (file)
--- a/modules/m_who.c
+++ b/modules/m_who.c
@@ -32,7 +32,7 @@
 #include "numeric.h"
 #include "s_serv.h"
 #include "send.h"
-#include "irc_string.h"
+#include "match.h"
 #include "s_conf.h"
 #include "logger.h"
 #include "msg.h"

diff --git a/modules/m_whois.c b/modules/m_whois.c
index c3da07abe93307da1af334f49bd3c4c183536df9..54c71a1d5647c61a9389dc59c9496d066c8d8543 100644 (file)
--- a/modules/m_whois.c
+++ b/modules/m_whois.c
@@ -35,7 +35,7 @@
 #include "s_conf.h"
 #include "s_serv.h"
 #include "send.h"
-#include "irc_string.h"
+#include "match.h"
 #include "s_conf.h"
 #include "logger.h"
 #include "msg.h"

diff --git a/modules/m_whowas.c b/modules/m_whowas.c
index 0728a80e95af2d0cd7ecdfb533075d8324fe1eb8..5ad67dfd3132642b29fd1c09aaa9b10c4fbf05fc 100644 (file)
--- a/modules/m_whowas.c
+++ b/modules/m_whowas.c
@@ -29,7 +29,7 @@
 #include "client.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "ircd_defs.h"
 #include "numeric.h"

diff --git a/modules/m_xline.c b/modules/m_xline.c
index 957486f940abb2b6a87eae3ac65c5a3bb9b854db..fba0a131547d7a542977d49f6204351ab6c36542 100644 (file)
--- a/modules/m_xline.c
+++ b/modules/m_xline.c
@@ -42,7 +42,7 @@
 #include "logger.h"
 #include "s_serv.h"
 #include "whowas.h"
-#include "irc_string.h"
+#include "match.h"
 #include "hash.h"
 #include "msg.h"
 #include "parse.h"

diff --git a/src/channel.c b/src/channel.c
index 980cef9bff8c8723a9e0234576909fcda3731bd8..db8d327e1d19ec0dba34a21fe8c70e8efc7ac287 100644 (file)
--- a/src/channel.c
+++ b/src/channel.c
@@ -30,7 +30,7 @@
 #include "common.h"
 #include "hash.h"
 #include "hook.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_serv.h"            /* captab */

diff --git a/src/chmode.c b/src/chmode.c
index 78682fbab0dc8c875747be031825b802a679695a..82adf8a393a1c144b5e988bf64a90d5252ec3caa 100644 (file)
--- a/src/chmode.c
+++ b/src/chmode.c
@@ -31,7 +31,7 @@
 #include "common.h"
 #include "hash.h"
 #include "hook.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_serv.h"            /* captab */

diff --git a/src/class.c b/src/class.c
index f3a60e8f01218b7229910dba9ab4c22356ac5d85..4b4769eb82e4067845b6c267eefc805a935e16a5 100644 (file)
--- a/src/class.c
+++ b/src/class.c
@@ -35,7 +35,7 @@
 #include "s_conf.h"
 #include "s_newconf.h"
 #include "send.h"
-#include "irc_string.h"
+#include "match.h"
 
 #define BAD_CONF_CLASS          -1
 #define BAD_PING                -2

diff --git a/src/client.c b/src/client.c
index dc88b936e71ce053907918986f3291790fdd9567..0d4f5a198371c39ff3612e43bb6ab7e3c63646c8 100644 (file)
--- a/src/client.c
+++ b/src/client.c
@@ -31,7 +31,7 @@
 #include "class.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "packet.h"

diff --git a/src/hash.c b/src/hash.c
index 7d57e2ff374d3e5e791f01b35631fca3680148c4..10e35066d83ef9088e2a4644a43e796aa9223235 100644 (file)
--- a/src/hash.c
+++ b/src/hash.c
@@ -31,7 +31,7 @@
 #include "client.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"

diff --git a/src/hook.c b/src/hook.c
index ef9b2229ef1eeec228e2f8695de6802b2967aa6c..5ef51f0cdf9943af88b7457efea039d0f3ead730 100644 (file)
--- a/src/hook.c
+++ b/src/hook.c
@@ -38,7 +38,7 @@
  */
 #include "stdinc.h"
 #include "hook.h"
-#include "irc_string.h"
+#include "match.h"
 
 hook *hooks;
 

diff --git a/src/hostmask.c b/src/hostmask.c
index 3b353b94d1c7f9442e1e3faf8427260e52e1a670..e322e861cc9870fc4b90b86ee18d37027c9456b7 100644 (file)
--- a/src/hostmask.c
+++ b/src/hostmask.c
@@ -31,7 +31,7 @@
 #include "hostmask.h"
 #include "numeric.h"
 #include "send.h"
-#include "irc_string.h"
+#include "match.h"
 
 #ifdef RB_IPV6
 static unsigned long hash_ipv6(struct sockaddr *, int);

diff --git a/src/irc_dictionary.c b/src/irc_dictionary.c
index 0a827dbfe24f491fdff9d4a5904a19a271feec96..9096790c2adfc7d7f5314b477145d2e04cc4583a 100644 (file)
--- a/src/irc_dictionary.c
+++ b/src/irc_dictionary.c
@@ -23,7 +23,7 @@
  */
 
 #include "stdinc.h"
-#include "irc_string.h"
+#include "match.h"
 #include "client.h"
 #include "setup.h"
 #include "irc_dictionary.h"

diff --git a/src/irc_string.c b/src/irc_string.c
index 6d7b8ea575bd48fa8cbafa775281669dd7d4d54b..5b3a46320dfd4bcc0d56b96ca110b1ae4cde788a 100644 (file)
--- a/src/irc_string.c
+++ b/src/irc_string.c
@@ -24,10 +24,7 @@
  *  $Id: irc_string.c 678 2006-02-03 20:25:01Z jilles $
  */
 
-#include "stdinc.h"
 #include "irc_string.h"
-#include "client.h"
-#include "setup.h"
 
 char *
 strip_colour(char *string)

diff --git a/src/ircd.c b/src/ircd.c
index 9d8f54fd8a3c5befc6fc274bb7fdd8e0c0d29665..9068b2638c84c6b9a485781229433f507d277344 100644 (file)
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -34,7 +34,7 @@
 #include "client.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd_signal.h"
 #include "msg.h"               /* msgtab */
 #include "hostmask.h"

diff --git a/src/kdparse.c b/src/kdparse.c
index ef64d9c8d0be3b34a28e5bd46c9611d14545091b..69a0c568da6bd672727f531b7cfb2f139c3a76cc 100644 (file)
--- a/src/kdparse.c
+++ b/src/kdparse.c
@@ -30,7 +30,7 @@
 #include "s_newconf.h"
 #include "hostmask.h"
 #include "client.h"
-#include "irc_string.h"
+#include "match.h"
 #include "hash.h"
 
 /* conf_add_fields()

diff --git a/src/listener.c b/src/listener.c
index 2fdea2817417651c5d95eccf07ca9accb3e70e91..60289fb2c56341c373df03741a6917588815f8cf 100644 (file)
--- a/src/listener.c
+++ b/src/listener.c
@@ -28,7 +28,7 @@
 #include "setup.h"
 #include "listener.h"
 #include "client.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "ircd_defs.h"
 #include "numeric.h"

diff --git a/src/match.c b/src/match.c
index f764c64aebaa502dd68794e6fac4c15395722747..44de3286fecea80d3f67a4be2dc3838f2d2de9fa 100644 (file)
--- a/src/match.c
+++ b/src/match.c
@@ -23,7 +23,7 @@
 #include "config.h"
 #include "client.h"
 #include "ircd.h"
-#include "irc_string.h"
+#include "match.h"
 
 /*
  * Compare if a given string (name) matches the given

diff --git a/src/modules.c b/src/modules.c
index 115f511d215bc305dc6cb969ffc697b35c91f148..a8b84afe80c631a4ac4978de4faf1c0321b06641 100644 (file)
--- a/src/modules.c
+++ b/src/modules.c
@@ -37,7 +37,7 @@
 #include "numeric.h"
 #include "parse.h"
 #include "ircd_defs.h"
-#include "irc_string.h"
+#include "match.h"
 
 
 

diff --git a/src/numeric.c b/src/numeric.c
index f43b763df3e2c62b44245476b6da94b48ae26ce4..71b970d654f1f5a84c804533c6fbf54b933c58b7 100644 (file)
--- a/src/numeric.c
+++ b/src/numeric.c
@@ -29,7 +29,7 @@
 #include "config.h"
 #include "s_conf.h"
 #include "numeric.h"
-#include "irc_string.h"
+#include "match.h"
 #include "common.h"            /* NULL cripes */
 
 #include "messages.tab"

diff --git a/src/packet.c b/src/packet.c
index 9d8207b1bf6817828066ea70a78e6683f4ac5313..fdba54e55935aaaa0cc934f03c388e9f82ef1c38 100644 (file)
--- a/src/packet.c
+++ b/src/packet.c
@@ -31,7 +31,7 @@
 #include "ircd.h"
 #include "parse.h"
 #include "packet.h"
-#include "irc_string.h"
+#include "match.h"
 #include "hook.h"
 #include "send.h"
 

diff --git a/src/parse.c b/src/parse.c
index a2979b692d2f3cb057764154b75e1b773ef2da8c..79c037e5bc6801353c90bb572b972e7dd503ccdc 100644 (file)
--- a/src/parse.c
+++ b/src/parse.c
@@ -31,7 +31,7 @@
 #include "channel.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "logger.h"

diff --git a/src/res.c b/src/res.c
index bd5b31cce52202e58a7902a4a3470b98c7178aee..7af69af080542a65bc7e31d81913d38f71fa8c5e 100644 (file)
--- a/src/res.c
+++ b/src/res.c
@@ -31,7 +31,7 @@
 #include "ircd.h"
 #include "res.h"
 #include "reslib.h"
-#include "irc_string.h"
+#include "match.h"
 #include "numeric.h"
 #include "client.h" /* SNO_* */
 

diff --git a/src/reslib.c b/src/reslib.c
index 516cb65e2de7a406b60a50e016e4810919c9a4c2..d646428295eb7601187751058f8a8d14b74f9541 100644 (file)
--- a/src/reslib.c
+++ b/src/reslib.c
@@ -86,7 +86,7 @@
 #include "ircd.h"
 #include "res.h"
 #include "reslib.h"
-#include "irc_string.h"
+#include "match.h"
 
 #define NS_TYPE_ELT             0x40 /* EDNS0 extended label type */
 #define DNS_LABELTYPE_BITSTRING 0x41

diff --git a/src/s_auth.c b/src/s_auth.c
index bb67394e55ddfed9904bf55a7169f078e7fae15b..2ea496db7fb6a7af55c898e9a9c2e5a22b2698d6 100644 (file)
--- a/src/s_auth.c
+++ b/src/s_auth.c
@@ -39,7 +39,7 @@
 #include "s_conf.h"
 #include "client.h"
 #include "common.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "packet.h"

diff --git a/src/s_conf.c b/src/s_conf.c
index a8ec861a13bb52deb6a7b11b606cecc1238ba129..d1719b8759d83c8b4ad3744c247e1f57e6cf6503 100644 (file)
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -35,7 +35,7 @@
 #include "client.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "listener.h"
 #include "hostmask.h"

diff --git a/src/s_serv.c b/src/s_serv.c
index d7e2a8a695719a320e4655d5040392aa4b8c7eb1..9a652d0c803f1901a4520b45b8a54c42f91b7176 100644 (file)
--- a/src/s_serv.c
+++ b/src/s_serv.c
@@ -35,7 +35,7 @@
 #include "client.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "ircd_defs.h"
 #include "numeric.h"

diff --git a/src/s_user.c b/src/s_user.c
index 2501ac40ead3a7c8c7d9b56dc1c4ed0e17af0843..a366e7d5a75362302bfe2182515be6e716158879 100644 (file)
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -31,7 +31,7 @@
 #include "client.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "listener.h"
 #include "msg.h"

diff --git a/src/scache.c b/src/scache.c
index 1ec035da7c5e40a97da50d1c4d1f9af27fee082e..ff8c9fac5ee6b9f0c033a7e628b241f0e59aaf7d 100644 (file)
--- a/src/scache.c
+++ b/src/scache.c
@@ -27,7 +27,7 @@
 #include "stdinc.h"
 #include "client.h"
 #include "common.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"

diff --git a/src/send.c b/src/send.c
index 19876879b267afac7b3b105bc85652a8d2780e90..a3154c3a0b0387262c9894b0ad50c4e679d334ce 100644 (file)
--- a/src/send.c
+++ b/src/send.c
@@ -30,7 +30,7 @@
 #include "class.h"
 #include "client.h"
 #include "common.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_serv.h"

diff --git a/src/substitution.c b/src/substitution.c
index 81e8b6824c952114e17148d3d50f374c2184f0d8..e92fae4a8e525926dcd75b2e27d798647c72b4ff 100644 (file)
--- a/src/substitution.c
+++ b/src/substitution.c
@@ -35,7 +35,7 @@
 
 #include "stdinc.h"
 #include "s_user.h"
-#include "irc_string.h"
+#include "match.h"
 
 /*
  * Simple mappings for $foo -> 'bar'.

diff --git a/src/whowas.c b/src/whowas.c
index 36de9135737f3f8f862159410c60b5e24403e0b2..9d910a01da7e1d09947c603d793d5955962b38b8 100644 (file)
--- a/src/whowas.c
+++ b/src/whowas.c
@@ -30,7 +30,7 @@
 #include "client.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "ircd_defs.h"
 #include "numeric.h"

diff --git a/unsupported/m_clearchan.c b/unsupported/m_clearchan.c
index f1c557ee088dd330467731d9107531c7375e353a..0a3921f023acbfb37ceab5ca17576f7e236cd6fc 100644 (file)
--- a/unsupported/m_clearchan.c
+++ b/unsupported/m_clearchan.c
@@ -23,7 +23,7 @@
 #include "channel.h"
 #include "client.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_user.h"

diff --git a/unsupported/m_force.c b/unsupported/m_force.c
index 3f457a2ce6151fd476968b794677f7ab43264032..146fa9c16105e65cb98bf17ace0168eba02f6d5a 100644 (file)
--- a/unsupported/m_force.c
+++ b/unsupported/m_force.c
@@ -34,7 +34,7 @@
 #include "class.h"
 #include "client.h"
 #include "common.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "hostmask.h"
 #include "numeric.h"