From 4562c604897f18f08e1bee993d455d9c1774f9ad Mon Sep 17 00:00:00 2001 From: Valery Yatsko Date: Sun, 20 Apr 2008 09:47:38 +0400 Subject: [PATCH] irc_string.h -> match.h, irc_string.h; includes changed --- extensions/m_adminwall.c | 2 +- extensions/m_findforwards.c | 2 +- extensions/m_identify.c | 2 +- extensions/m_mkpasswd.c | 2 +- extensions/m_ojoin.c | 2 +- extensions/m_okick.c | 2 +- extensions/m_olist.c | 2 +- extensions/m_omode.c | 2 +- extensions/m_opme.c | 2 +- extensions/m_webirc.c | 2 +- include/client.h | 2 +- include/irc_string.h | 112 ---------------------------- include/match.h | 142 ++++++++++++++++++++++++++++++++++++ include/res.h | 2 +- modules/core/m_die.c | 2 +- modules/core/m_join.c | 2 +- modules/core/m_kick.c | 2 +- modules/core/m_kill.c | 2 +- modules/core/m_message.c | 3 +- modules/core/m_mode.c | 2 +- modules/core/m_nick.c | 2 +- modules/core/m_part.c | 3 +- modules/core/m_quit.c | 1 + modules/core/m_server.c | 2 +- modules/core/m_squit.c | 2 +- modules/m_away.c | 2 +- modules/m_cap.c | 2 +- modules/m_capab.c | 2 +- modules/m_challenge.c | 2 +- modules/m_connect.c | 2 +- modules/m_dline.c | 2 +- modules/m_etrace.c | 2 +- modules/m_info.c | 2 +- modules/m_invite.c | 2 +- modules/m_ison.c | 2 +- modules/m_kline.c | 2 +- modules/m_knock.c | 2 +- modules/m_links.c | 2 +- modules/m_list.c | 2 +- modules/m_locops.c | 2 +- modules/m_names.c | 2 +- modules/m_oper.c | 2 +- modules/m_pass.c | 2 +- modules/m_ping.c | 2 +- modules/m_pong.c | 2 +- modules/m_rehash.c | 2 +- modules/m_restart.c | 2 +- modules/m_scan.c | 2 +- modules/m_set.c | 2 +- modules/m_signon.c | 2 +- modules/m_snote.c | 2 +- modules/m_stats.c | 2 +- modules/m_svinfo.c | 2 +- modules/m_tb.c | 2 +- modules/m_testmask.c | 2 +- modules/m_topic.c | 2 +- modules/m_trace.c | 2 +- modules/m_user.c | 2 +- modules/m_userhost.c | 2 +- modules/m_wallops.c | 2 +- modules/m_who.c | 2 +- modules/m_whois.c | 2 +- modules/m_whowas.c | 2 +- modules/m_xline.c | 2 +- src/channel.c | 2 +- src/chmode.c | 2 +- src/class.c | 2 +- src/client.c | 2 +- src/hash.c | 2 +- src/hook.c | 2 +- src/hostmask.c | 2 +- src/irc_dictionary.c | 2 +- src/irc_string.c | 3 - src/ircd.c | 2 +- src/kdparse.c | 2 +- src/listener.c | 2 +- src/match.c | 2 +- src/modules.c | 2 +- src/numeric.c | 2 +- src/packet.c | 2 +- src/parse.c | 2 +- src/res.c | 2 +- src/reslib.c | 2 +- src/s_auth.c | 2 +- src/s_conf.c | 2 +- src/s_serv.c | 2 +- src/s_user.c | 2 +- src/scache.c | 2 +- src/send.c | 2 +- src/substitution.c | 2 +- src/whowas.c | 2 +- unsupported/m_clearchan.c | 2 +- unsupported/m_force.c | 2 +- 93 files changed, 234 insertions(+), 204 deletions(-) create mode 100644 include/match.h diff --git a/extensions/m_adminwall.c b/extensions/m_adminwall.c index eecf8b5c..b37734be 100644 --- 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 79bdeea6..e33ea178 100644 --- 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 76533c2e..c3f11009 100644 --- 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 804ae211..242b0667 100644 --- 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 53ed832f..96efcad9 100644 --- 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 156a046e..add1648c 100644 --- 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 cccb011a..4484ae5b 100644 --- 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 cb2b0d39..f1407ffd 100644 --- 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 f75f1655..e23d6c76 100644 --- 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 bec61e9e..8d2f2390 100644 --- 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 130f1920..1b934e76 100644 --- 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 63548450..d529fc8a 100644 --- 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 index 00000000..da6f781e --- /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 84d70e56..1b70094d 100644 --- 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 0ef29037..e8aa279e 100644 --- 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 48c87526..3b43683f 100644 --- 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 edec515f..a7d5e2a7 100644 --- 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 5fb4b4cf..ad286d5c 100644 --- 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 f559719c..b934b3e3 100644 --- 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 32b9127d..1653b09b 100644 --- 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 dd827b82..352de580 100644 --- 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 9e72ebc2..9b48020d 100644 --- 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 014d472b..346c49f0 100644 --- 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 0c90e62a..f4835090 100644 --- 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 67e939e9..9a2c2b75 100644 --- 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 6b350087..cd4c89bd 100644 --- 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 998d8f0d..9fa94d37 100644 --- 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 58901fb8..3bc93724 100644 --- 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 0d2278e4..ea7c1280 100644 --- 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 deb83b8d..9f586b49 100644 --- 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 6ca3da84..97e0aa65 100644 --- 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 9e2998da..35e93c1f 100644 --- 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 470ded5a..870fe121 100644 --- 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 eb6c0414..04e04f06 100644 --- 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 bcd7d943..d918b7bf 100644 --- 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 1dad6d9a..51579613 100644 --- 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 2c786e09..958951d3 100644 --- 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 75598a75..e4a0f881 100644 --- 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 e6aaff4e..db397a2b 100644 --- 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 96681e08..bf2e0144 100644 --- 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 d3c70249..76425fe7 100644 --- 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 886da7cc..ca5c2120 100644 --- 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 6ef11a8e..1f4255e2 100644 --- 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 f2a0be3e..6269c54e 100644 --- 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 7cf84d5a..e5fb98e0 100644 --- 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 ff0a08a1..8bddf18e 100644 --- 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 97f47db0..e175e9d9 100644 --- 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 ecb10e9d..23a64b35 100644 --- 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 e9d7f0a4..dfa7a8e4 100644 --- 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 b0503434..51d79714 100644 --- 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 785901e4..2ab7f7b3 100644 --- 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 ce73a7b9..8e3d1d29 100644 --- 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 a6b48482..6f7f3267 100644 --- 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 875713e9..ddc22459 100644 --- 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 089f5e9f..373193df 100644 --- 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 bc2bc168..9c911701 100644 --- 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 8d131596..2c8b9831 100644 --- 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 94a6577d..2f792a7b 100644 --- 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 964aa6b9..c819764e 100644 --- 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 ccd25e91..f468bff9 100644 --- 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 749d35f1..b0b76f56 100644 --- 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 c3da07ab..54c71a1d 100644 --- 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 0728a80e..5ad67dfd 100644 --- 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 957486f9..fba0a131 100644 --- 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 980cef9b..db8d327e 100644 --- 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 78682fba..82adf8a3 100644 --- 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 f3a60e8f..4b4769eb 100644 --- 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 dc88b936..0d4f5a19 100644 --- 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 7d57e2ff..10e35066 100644 --- 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 ef9b2229..5ef51f0c 100644 --- 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 3b353b94..e322e861 100644 --- 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 0a827dbf..9096790c 100644 --- 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 6d7b8ea5..5b3a4632 100644 --- 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 9d8f54fd..9068b263 100644 --- 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 ef64d9c8..69a0c568 100644 --- 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 2fdea281..60289fb2 100644 --- 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 f764c64a..44de3286 100644 --- 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 115f511d..a8b84afe 100644 --- 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 f43b763d..71b970d6 100644 --- 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 9d8207b1..fdba54e5 100644 --- 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 a2979b69..79c037e5 100644 --- 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 bd5b31cc..7af69af0 100644 --- 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 516cb65e..d6464282 100644 --- 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 bb67394e..2ea496db 100644 --- 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 a8ec861a..d1719b87 100644 --- 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 d7e2a8a6..9a652d0c 100644 --- 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 2501ac40..a366e7d5 100644 --- 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 1ec035da..ff8c9fac 100644 --- 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 19876879..a3154c3a 100644 --- 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 81e8b682..e92fae4a 100644 --- 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 36de9135..9d910a01 100644 --- 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 f1c557ee..0a3921f0 100644 --- 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 3f457a2c..146fa9c1 100644 --- 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"