Move check_if_ipmask() from support.* to match.*.

Remove support.c and support.h since the remaining function is never used.
Remove all #include "support.h" and update ircd/Makefile.in.

git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@1178 c9e4aea6-c8fd-4c43-8297-357d70d61c8c

diff --git a/include/match.h b/include/match.h
index 5cb7f3c7bb26726445a1e09f418d0d7fb045d057..70a8ad79f2d2dbcd3b4757e26f36982817fc5099 100644 (file)
--- a/include/match.h
+++ b/include/match.h
@@ -30,6 +30,7 @@ extern int matchexec(const char *string, const char *cmask, int minlen);
 extern int matchdecomp(char *mask, const char *cmask);
 extern int mmexec(const char *wcm, int wminlen, const char *rcm, int rminlen);
 
+extern int check_if_ipmask(const char *mask);
 extern int ipmask_parse(const char *in, struct irc_in_addr *mask, unsigned char *bits_ptr);
 extern int ipmask_check(const struct irc_in_addr *addr, const struct irc_in_addr *mask, unsigned char bits);
 

diff --git a/include/support.h b/include/support.h
deleted file mode 100644 (file)
index 1ac7e78..0000000
--- a/include/support.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * support.h
- *
- * $Id$
- */
-#ifndef INCLUDED_support_h
-#define INCLUDED_support_h
-
-/*
- * Given a number of bits, make a netmask out of it.
- */
-#define NETMASK(bits) htonl((0xffffffff>>(32-(bits)))<<(32-(bits)))
-
-
-/*
- * Prototypes
- */
-  
-extern int check_if_ipmask(const char *mask);
-extern void write_log(const char *filename, const char *pattern, ...);
-
-#endif /* INCLUDED_support_h */

diff --git a/ircd/Makefile.in b/ircd/Makefile.in
index 2867eab4b2338e09c05eb5ba7ace29853cb250a4..aff235e113a4ca480d3259d1381dc0a87f313793 100644 (file)
--- a/ircd/Makefile.in
+++ b/ircd/Makefile.in
@@ -204,7 +204,6 @@ IRCD_SRC = \
        s_stats.c \
        s_user.c \
        send.c \
-       support.c \
        uping.c \
        userload.c \
        whocmds.c \
@@ -377,8 +376,8 @@ channel.o: channel.c ../config.h ../include/channel.h \
   ../include/match.h ../include/msg.h ../include/numeric.h \
   ../include/numnicks.h ../include/querycmds.h ../include/s_bsd.h \
   ../include/s_conf.h ../include/s_debug.h ../include/s_misc.h \
-  ../include/s_user.h ../include/send.h ../include/support.h \
-  ../include/sys.h ../include/whowas.h
+  ../include/s_user.h ../include/send.h ../include/sys.h \
+  ../include/whowas.h
 class.o: class.c ../config.h ../include/class.h ../include/client.h \
   ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \
   ../include/ircd_events.h ../include/ircd_handler.h ../include/res.h \
@@ -417,14 +416,14 @@ gline.o: gline.c ../config.h ../include/gline.h ../include/res.h \
   ../include/ircd_string.h ../include/ircd_chattr.h ../include/match.h \
   ../include/numeric.h ../include/s_bsd.h ../include/s_debug.h \
   ../include/s_misc.h ../include/s_stats.h ../include/send.h \
-  ../include/support.h ../include/msg.h ../include/numnicks.h \
-  ../include/sys.h ../include/whocmds.h
+  ../include/msg.h ../include/numnicks.h ../include/sys.h \
+  ../include/whocmds.h
 hash.o: hash.c ../config.h ../include/hash.h ../include/client.h \
   ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \
   ../include/ircd_events.h ../include/ircd_handler.h ../include/res.h \
   ../include/channel.h ../include/ircd_chattr.h ../include/ircd_string.h \
   ../include/ircd.h ../include/struct.h ../include/msg.h \
-  ../include/send.h ../include/support.h ../include/sys.h
+  ../include/send.h ../include/sys.h
 ircd.o: ircd.c ../config.h ../include/ircd.h ../include/struct.h \
   ../include/ircd_defs.h ../include/IPcheck.h ../include/class.h \
   ../include/client.h ../include/dbuf.h ../include/msgq.h \
@@ -452,7 +451,8 @@ ircd_auth.o: ircd_auth.c ../config.h ../include/client.h \
   ../include/ircd_osdep.h ../include/ircd_snprintf.h \
   ../include/ircd_string.h ../include/ircd_chattr.h ../include/ircd.h \
   ../include/struct.h ../include/msg.h ../include/s_bsd.h \
-  ../include/s_misc.h ../include/s_user.h ../include/send.h
+  ../include/s_debug.h ../include/s_misc.h ../include/s_user.h \
+  ../include/send.h
 ircd_crypt.o: ircd_crypt.c ../config.h ../include/ircd_crypt.h \
   ../include/ircd_alloc.h ../include/ircd_features.h \
   ../include/ircd_string.h ../include/ircd_chattr.h ../include/s_debug.h \
@@ -472,7 +472,7 @@ ircd_features.o: ircd_features.c ../config.h ../include/ircd_features.h \
   ../include/motd.h ../include/msg.h ../include/numeric.h \
   ../include/numnicks.h ../include/random.h ../include/s_bsd.h \
   ../include/s_debug.h ../include/s_misc.h ../include/send.h \
-  ../include/support.h ../include/sys.h ../include/whowas.h
+  ../include/sys.h ../include/whowas.h
 ircd_log.o: ircd_log.c ../config.h ../include/ircd_log.h \
   ../include/client.h ../include/ircd_defs.h ../include/dbuf.h \
   ../include/msgq.h ../include/ircd_events.h ../include/ircd_handler.h \
@@ -502,8 +502,9 @@ ircd_res.o: ircd_res.c ../include/client.h ../include/ircd_defs.h \
   ../include/ircd_reply.h ../include/ircd_string.h \
   ../include/ircd_chattr.h ../include/ircd_snprintf.h ../include/ircd.h \
   ../include/struct.h ../include/numeric.h ../include/fileio.h \
-  ../include/s_bsd.h ../include/s_stats.h ../include/ircd_features.h \
-  ../include/send.h ../include/sys.h ../include/ircd_reslib.h
+  ../include/s_bsd.h ../include/s_debug.h ../include/s_stats.h \
+  ../include/ircd_features.h ../include/send.h ../include/sys.h \
+  ../include/ircd_reslib.h
 ircd_reslib.o: ircd_reslib.c ../include/ircd.h ../include/struct.h \
   ../include/ircd_defs.h ../include/res.h ../config.h \
   ../include/ircd_reslib.h ../include/fileio.h ../include/ircd_string.h \
@@ -528,8 +529,7 @@ jupe.o: jupe.c ../config.h ../include/jupe.h ../include/client.h \
   ../include/ircd_log.h ../include/ircd_reply.h ../include/ircd_string.h \
   ../include/ircd_chattr.h ../include/match.h ../include/msg.h \
   ../include/numeric.h ../include/numnicks.h ../include/s_bsd.h \
-  ../include/s_misc.h ../include/send.h ../include/support.h \
-  ../include/sys.h
+  ../include/s_misc.h ../include/send.h ../include/sys.h
 lex.yy.o: lex.yy.c ../config.h ../include/ircd.h ../include/struct.h \
   ../include/ircd_defs.h ../include/ircd_string.h \
   ../include/ircd_chattr.h ../include/s_debug.h y.tab.h
@@ -541,8 +541,7 @@ list.o: list.c ../config.h ../include/list.h ../include/client.h \
   ../include/ircd_chattr.h ../include/listener.h ../include/match.h \
   ../include/numeric.h ../include/s_auth.h ../include/s_bsd.h \
   ../include/s_conf.h ../include/s_debug.h ../include/s_misc.h \
-  ../include/s_user.h ../include/send.h ../include/support.h \
-  ../include/whowas.h
+  ../include/s_user.h ../include/send.h ../include/whowas.h
 listener.o: listener.c ../config.h ../include/listener.h \
   ../include/ircd_defs.h ../include/ircd_events.h ../include/res.h \
   ../include/client.h ../include/dbuf.h ../include/msgq.h \
@@ -590,7 +589,7 @@ m_burst.o: m_burst.c ../config.h ../include/channel.h \
   ../include/ircd_chattr.h ../include/list.h ../include/match.h \
   ../include/msg.h ../include/numeric.h ../include/numnicks.h \
   ../include/s_conf.h ../include/s_misc.h ../include/send.h \
-  ../include/support.h ../include/ircd_snprintf.h
+  ../include/ircd_snprintf.h
 m_clearmode.o: m_clearmode.c ../config.h ../include/client.h \
   ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \
   ../include/ircd_events.h ../include/ircd_handler.h ../include/res.h \
@@ -599,7 +598,7 @@ m_clearmode.o: m_clearmode.c ../config.h ../include/client.h \
   ../include/ircd_log.h ../include/ircd_reply.h ../include/ircd_string.h \
   ../include/ircd_chattr.h ../include/list.h ../include/msg.h \
   ../include/numeric.h ../include/numnicks.h ../include/s_conf.h \
-  ../include/send.h ../include/support.h
+  ../include/send.h
 m_close.o: m_close.c ../config.h ../include/client.h \
   ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \
   ../include/ircd_events.h ../include/ircd_handler.h ../include/res.h \
@@ -684,8 +683,7 @@ m_gline.o: m_gline.c ../config.h ../include/client.h \
   ../include/struct.h ../include/ircd_features.h ../include/ircd_reply.h \
   ../include/ircd_string.h ../include/ircd_chattr.h ../include/match.h \
   ../include/msg.h ../include/numeric.h ../include/numnicks.h \
-  ../include/s_conf.h ../include/s_misc.h ../include/send.h \
-  ../include/support.h
+  ../include/s_conf.h ../include/s_misc.h ../include/send.h
 m_help.o: m_help.c ../config.h ../include/client.h ../include/ircd_defs.h \
   ../include/dbuf.h ../include/msgq.h ../include/ircd_events.h \
   ../include/ircd_handler.h ../include/res.h ../include/hash.h \
@@ -728,8 +726,7 @@ m_jupe.o: m_jupe.c ../config.h ../include/client.h ../include/ircd_defs.h \
   ../include/ircd_features.h ../include/ircd_reply.h \
   ../include/ircd_string.h ../include/ircd_chattr.h ../include/match.h \
   ../include/msg.h ../include/numeric.h ../include/numnicks.h \
-  ../include/s_conf.h ../include/s_misc.h ../include/send.h \
-  ../include/support.h
+  ../include/s_conf.h ../include/s_misc.h ../include/send.h
 m_kick.o: m_kick.c ../config.h ../include/channel.h \
   ../include/ircd_defs.h ../include/client.h ../include/dbuf.h \
   ../include/msgq.h ../include/ircd_events.h ../include/ircd_handler.h \
@@ -826,7 +823,7 @@ m_oper.o: m_oper.c ../config.h ../include/client.h ../include/ircd_defs.h \
   ../include/ircd_chattr.h ../include/ircd_crypt.h ../include/msg.h \
   ../include/numeric.h ../include/numnicks.h ../include/querycmds.h \
   ../include/s_conf.h ../include/s_debug.h ../include/s_user.h \
-  ../include/s_misc.h ../include/send.h ../include/support.h
+  ../include/s_misc.h ../include/send.h
 m_opmode.o: m_opmode.c ../config.h ../include/client.h \
   ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \
   ../include/ircd_events.h ../include/ircd_handler.h ../include/res.h \
@@ -1077,7 +1074,7 @@ m_who.o: m_who.c ../config.h ../include/channel.h ../include/ircd_defs.h \
   ../include/ircd_chattr.h ../include/ircd_features.h \
   ../include/ircd_log.h ../include/ircd_reply.h ../include/ircd_string.h \
   ../include/match.h ../include/numeric.h ../include/numnicks.h \
-  ../include/send.h ../include/support.h ../include/whocmds.h
+  ../include/send.h ../include/whocmds.h
 m_whois.o: m_whois.c ../config.h ../include/channel.h \
   ../include/ircd_defs.h ../include/client.h ../include/dbuf.h \
   ../include/msgq.h ../include/ircd_events.h ../include/ircd_handler.h \
@@ -1096,7 +1093,7 @@ m_whowas.o: m_whowas.c ../config.h ../include/client.h \
   ../include/s_misc.h ../include/send.h ../include/whowas.h
 match.o: match.c ../config.h ../include/match.h ../include/res.h \
   ../include/ircd_chattr.h ../include/ircd_string.h \
-  ../include/ircd_snprintf.h ../include/support.h
+  ../include/ircd_snprintf.h
 memdebug.o: memdebug.c ../include/ircd.h ../include/struct.h \
   ../include/ircd_defs.h ../include/ircd_alloc.h ../include/client.h \
   ../include/dbuf.h ../include/msgq.h ../include/ircd_events.h \
@@ -1182,8 +1179,7 @@ s_bsd.o: s_bsd.c ../config.h ../include/s_bsd.h ../include/client.h \
   ../include/packet.h ../include/parse.h ../include/querycmds.h \
   ../include/s_auth.h ../include/s_conf.h ../include/s_debug.h \
   ../include/s_misc.h ../include/s_user.h ../include/send.h \
-  ../include/support.h ../include/sys.h ../include/uping.h \
-  ../include/version.h
+  ../include/sys.h ../include/uping.h ../include/version.h
 s_conf.o: s_conf.c ../config.h ../include/s_conf.h ../include/client.h \
   ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \
   ../include/ircd_events.h ../include/ircd_handler.h ../include/res.h \
@@ -1196,8 +1192,7 @@ s_conf.o: s_conf.c ../config.h ../include/s_conf.h ../include/client.h \
   ../include/listener.h ../include/match.h ../include/motd.h \
   ../include/numeric.h ../include/numnicks.h ../include/opercmds.h \
   ../include/parse.h ../include/s_bsd.h ../include/s_debug.h \
-  ../include/s_misc.h ../include/send.h ../include/support.h \
-  ../include/sys.h
+  ../include/s_misc.h ../include/send.h ../include/sys.h
 s_debug.o: s_debug.c ../config.h ../include/s_debug.h \
   ../include/ircd_defs.h ../include/channel.h ../include/class.h \
   ../include/client.h ../include/dbuf.h ../include/msgq.h \
@@ -1223,8 +1218,7 @@ s_misc.o: s_misc.c ../config.h ../include/s_misc.h ../include/IPcheck.h \
   ../include/numnicks.h ../include/parse.h ../include/querycmds.h \
   ../include/s_bsd.h ../include/s_conf.h ../include/s_debug.h \
   ../include/s_stats.h ../include/s_user.h ../include/send.h \
-  ../include/support.h ../include/sys.h ../include/uping.h \
-  ../include/userload.h
+  ../include/sys.h ../include/uping.h ../include/userload.h
 s_numeric.o: s_numeric.c ../config.h ../include/s_numeric.h \
   ../include/channel.h ../include/ircd_defs.h ../include/client.h \
   ../include/dbuf.h ../include/msgq.h ../include/ircd_events.h \
@@ -1270,9 +1264,9 @@ s_user.o: s_user.c ../config.h ../include/s_user.h ../include/IPcheck.h \
   ../include/numnicks.h ../include/parse.h ../include/querycmds.h \
   ../include/random.h ../include/s_bsd.h ../include/s_conf.h \
   ../include/s_debug.h ../include/s_misc.h ../include/s_serv.h \
-  ../include/send.h ../include/support.h ../include/supported.h \
-  ../include/sys.h ../include/userload.h ../include/version.h \
-  ../include/whowas.h ../include/handlers.h
+  ../include/send.h ../include/supported.h ../include/sys.h \
+  ../include/userload.h ../include/version.h ../include/whowas.h \
+  ../include/handlers.h
 send.o: send.c ../config.h ../include/send.h ../include/channel.h \
   ../include/ircd_defs.h ../include/class.h ../include/client.h \
   ../include/dbuf.h ../include/msgq.h ../include/ircd_events.h \
@@ -1283,10 +1277,6 @@ send.o: send.c ../config.h ../include/send.h ../include/channel.h \
   ../include/msg.h ../include/numnicks.h ../include/parse.h \
   ../include/s_bsd.h ../include/s_debug.h ../include/s_misc.h \
   ../include/s_user.h ../include/sys.h
-support.o: support.c ../config.h ../include/support.h ../include/fileio.h \
-  ../include/ircd.h ../include/struct.h ../include/ircd_defs.h \
-  ../include/ircd_chattr.h ../include/ircd_snprintf.h ../include/s_bsd.h \
-  ../include/s_debug.h ../include/send.h ../include/sys.h
 uping.o: uping.c ../config.h ../include/uping.h ../include/ircd_defs.h \
   ../include/ircd_events.h ../include/res.h ../include/client.h \
   ../include/dbuf.h ../include/msgq.h ../include/ircd_handler.h \
@@ -1313,9 +1303,8 @@ whocmds.o: whocmds.c ../config.h ../include/whocmds.h \
   ../include/match.h ../include/numeric.h ../include/numnicks.h \
   ../include/querycmds.h ../include/random.h ../include/s_bsd.h \
   ../include/s_conf.h ../include/s_misc.h ../include/s_user.h \
-  ../include/send.h ../include/support.h ../include/sys.h \
-  ../include/userload.h ../include/version.h ../include/whowas.h \
-  ../include/msg.h
+  ../include/send.h ../include/sys.h ../include/userload.h \
+  ../include/version.h ../include/whowas.h ../include/msg.h
 whowas.o: whowas.c ../config.h ../include/whowas.h ../include/client.h \
   ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \
   ../include/ircd_events.h ../include/ircd_handler.h ../include/res.h \
@@ -1323,8 +1312,7 @@ whowas.o: whowas.c ../config.h ../include/whowas.h ../include/client.h \
   ../include/ircd_chattr.h ../include/ircd_features.h \
   ../include/ircd_string.h ../include/list.h ../include/numeric.h \
   ../include/s_debug.h ../include/s_misc.h ../include/s_user.h \
-  ../include/send.h ../include/support.h ../include/sys.h \
-  ../include/msg.h
+  ../include/send.h ../include/sys.h ../include/msg.h
 y.tab.o: y.tab.c ../config.h ../include/s_conf.h ../include/client.h \
   ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \
   ../include/ircd_events.h ../include/ircd_handler.h ../include/res.h \
@@ -1337,7 +1325,7 @@ y.tab.o: y.tab.c ../config.h ../include/s_conf.h ../include/client.h \
   ../include/match.h ../include/motd.h ../include/numeric.h \
   ../include/numnicks.h ../include/opercmds.h ../include/parse.h \
   ../include/s_bsd.h ../include/s_debug.h ../include/s_misc.h \
-  ../include/send.h ../include/support.h ../include/sys.h
+  ../include/send.h ../include/sys.h
 engine_devpoll.o: engine_devpoll.c ../config.h ../include/ircd_events.h \
   ../include/ircd.h ../include/struct.h ../include/ircd_defs.h \
   ../include/ircd_alloc.h ../include/ircd_features.h \

diff --git a/ircd/channel.c b/ircd/channel.c
index 0c4d90589c8c2683e7e141edcd010c4bee5699ba..c5f01b45cf54aa541f2f9348b5b9c0d0468ca773 100644 (file)
--- a/ircd/channel.c
+++ b/ircd/channel.c
@@ -50,7 +50,6 @@
 #include "s_user.h"
 #include "send.h"
 #include "struct.h"
-#include "support.h"
 #include "sys.h"
 #include "whowas.h"
 

diff --git a/ircd/gline.c b/ircd/gline.c
index d94cfa8a608345e36374f8598f41609aa431e80b..7a7cc63a395851057e036d4212cd102d6dce06d2 100644 (file)
--- a/ircd/gline.c
+++ b/ircd/gline.c
@@ -38,7 +38,6 @@
 #include "s_stats.h"
 #include "send.h"
 #include "struct.h"
-#include "support.h"
 #include "msg.h"
 #include "numnicks.h"
 #include "numeric.h"

diff --git a/ircd/hash.c b/ircd/hash.c
index 5414af42481ca33bea390bc5de8721f527b10862..21539c34391f3cddc0a20e0dc9ffa71a803cfd82 100644 (file)
--- a/ircd/hash.c
+++ b/ircd/hash.c
@@ -32,7 +32,6 @@
 #include "msg.h"
 #include "send.h"
 #include "struct.h"
-#include "support.h"
 #include "sys.h"
 
 #include <assert.h>

diff --git a/ircd/ircd_features.c b/ircd/ircd_features.c
index 5a80dcda675b04a18a2698b5042d59b45250f233..925e8fec8eef2c0bee51a42e0e5ccf54804e1fa5 100644 (file)
--- a/ircd/ircd_features.c
+++ b/ircd/ircd_features.c
@@ -41,7 +41,6 @@
 #include "s_misc.h"
 #include "send.h"
 #include "struct.h"
-#include "support.h"
 #include "sys.h"    /* FALSE bleah */
 #include "whowas.h"    /* whowas_realloc */
 

diff --git a/ircd/ircd_parser.y b/ircd/ircd_parser.y
index 608d518a4c635d79f06fdb41a4a9c5181bef50dd..ef910fb138e6b8498e42fc313e838f685a42bbb1 100644 (file)
--- a/ircd/ircd_parser.y
+++ b/ircd/ircd_parser.y
@@ -53,7 +53,6 @@
 #include "s_misc.h"
 #include "send.h"
 #include "struct.h"
-#include "support.h"
 #include "sys.h"
 #include <stdlib.h>
 #include <stdio.h>

diff --git a/ircd/jupe.c b/ircd/jupe.c
index e54d0608a4526caad48110c6dcc92c9326966e89..7597ab6002bc1ba7162dc86e5ab88e66f29cbf32 100644 (file)
--- a/ircd/jupe.c
+++ b/ircd/jupe.c
@@ -39,7 +39,6 @@
 #include "s_misc.h"
 #include "send.h"
 #include "struct.h"
-#include "support.h"
 #include "sys.h"    /* FALSE bleah */
 
 #include <assert.h>

diff --git a/ircd/list.c b/ircd/list.c
index 813ccbca95cc53b1fab13527338d544f5d2d3081..8f7847a981547c4abbc08e36979af8331d18d6f6 100644 (file)
--- a/ircd/list.c
+++ b/ircd/list.c
@@ -40,7 +40,6 @@
 #include "s_user.h"
 #include "send.h"
 #include "struct.h"
-#include "support.h"
 #include "whowas.h"
 
 #include <assert.h>

diff --git a/ircd/m_burst.c b/ircd/m_burst.c
index f282ba96405ac59e5ece197a99ab34c28e7e005f..6c9fd1d89c557b1c89f99ad6741054c23c811833 100644 (file)
--- a/ircd/m_burst.c
+++ b/ircd/m_burst.c
@@ -98,7 +98,6 @@
 #include "s_misc.h"
 #include "send.h"
 #include "struct.h"
-#include "support.h"
 #include "ircd_snprintf.h"
 
 #include <assert.h>

diff --git a/ircd/m_clearmode.c b/ircd/m_clearmode.c
index a3ad7bb5365427f748d50555b245ceb1e95c9c71..4d01f5f6f73a52149b387a93686f2b9baba5d261 100644 (file)
--- a/ircd/m_clearmode.c
+++ b/ircd/m_clearmode.c
@@ -97,7 +97,6 @@
 #include "numnicks.h"
 #include "s_conf.h"
 #include "send.h"
-#include "support.h"
 
 #include <assert.h>
 

diff --git a/ircd/m_gline.c b/ircd/m_gline.c
index 027d88e90e5144d370161d8e198fd069d84de489..636879cc422c72279cfe347462d95f04339d39ae 100644 (file)
--- a/ircd/m_gline.c
+++ b/ircd/m_gline.c
@@ -95,7 +95,6 @@
 #include "s_conf.h"
 #include "s_misc.h"
 #include "send.h"
-#include "support.h"
 
 #include <assert.h>
 #include <stdlib.h>

diff --git a/ircd/m_jupe.c b/ircd/m_jupe.c
index 418efead0267af0d35c6c4d38e7164e2f3d4a050..7d89ee5965ca50812bf48770ab3abdc95e544c26 100644 (file)
--- a/ircd/m_jupe.c
+++ b/ircd/m_jupe.c
@@ -96,7 +96,6 @@
 #include "s_conf.h"
 #include "s_misc.h"
 #include "send.h"
-#include "support.h"
 
 #include <assert.h>
 #include <stdlib.h>

diff --git a/ircd/m_oper.c b/ircd/m_oper.c
index cc2e47cedf17d09513bc9691752506a6d0f20f7c..60e9997e66fcecea9151e53d45d9ab1b8d7cb235 100644 (file)
--- a/ircd/m_oper.c
+++ b/ircd/m_oper.c
@@ -98,7 +98,6 @@
 #include "s_user.h"
 #include "s_misc.h"
 #include "send.h"
-#include "support.h"
 
 #include <assert.h>
 #include <stdlib.h>

diff --git a/ircd/m_who.c b/ircd/m_who.c
index c4fd81f2a93a805fa891865905f2d9648b6bb990..04075ca0a3d3696c58a48da62316493ac2147918 100644 (file)
--- a/ircd/m_who.c
+++ b/ircd/m_who.c
@@ -94,7 +94,6 @@
 #include "numeric.h"
 #include "numnicks.h"
 #include "send.h"
-#include "support.h"
 #include "whocmds.h"
 
 #include <assert.h>

diff --git a/ircd/match.c b/ircd/match.c
index 5cb91da54b3dea2059ac4df0ba1edf2b7b6b2206..615a52f005f3750ef4e52f1f9b8cfd8231355df6 100644 (file)
--- a/ircd/match.c
+++ b/ircd/match.c
@@ -24,7 +24,6 @@
 #include "ircd_chattr.h"
 #include "ircd_string.h"
 #include "ircd_snprintf.h"
-#include "support.h"
 
 /*
  * mmatch()
@@ -814,6 +813,22 @@ static int ipmask_parse_ipv4(const char *in, struct in_addr *out)
   return bits;
 }
 
+int check_if_ipmask(const char *mask)
+{
+  int has_digit = 0;
+  const char *p;
+
+  for (p = mask; *p; ++p)
+    if (*p != '*' && *p != '?' && *p != '.' && *p != '/')
+    {
+      if (!IsDigit(*p))
+        return 0;
+      has_digit = -1;
+    }
+
+  return has_digit;
+}
+
 int ipmask_parse(const char *in, struct irc_in_addr *mask, unsigned char *bits_ptr)
 {
   struct in_addr ipv4;

diff --git a/ircd/s_bsd.c b/ircd/s_bsd.c
index 0ed3425b2667abd2f3389ccbf70ecbc8caf5bc57..105149e1c74130478f12da8fd0c03fb8d9818259 100644 (file)
--- a/ircd/s_bsd.c
+++ b/ircd/s_bsd.c
@@ -54,7 +54,6 @@
 #include "s_user.h"
 #include "send.h"
 #include "struct.h"
-#include "support.h"
 #include "sys.h"
 #include "uping.h"
 #include "version.h"

diff --git a/ircd/s_conf.c b/ircd/s_conf.c
index 9fdcd095d1847698b6f5d2c463b7719455a651e4..ff2863cf334e1b5a7e8996c18dcf21a12125e0ac 100644 (file)
--- a/ircd/s_conf.c
+++ b/ircd/s_conf.c
@@ -54,7 +54,6 @@
 #include "s_misc.h"
 #include "send.h"
 #include "struct.h"
-#include "support.h"
 #include "sys.h"
 
 #include <assert.h>

diff --git a/ircd/s_err.c b/ircd/s_err.c
index c36cf5212a4b9c4a1e4e4428e03dc3f0bd7fc807..980c282165e0e821b4e11bc0daddb62a5916773c 100644 (file)
--- a/ircd/s_err.c
+++ b/ircd/s_err.c
@@ -1255,7 +1255,6 @@ char* rpl_str(int n)
 {
   static char numbuff[512];
   Numeric* p;
-  const char *ap;
 
   assert(0 < n);
   assert(n < ERR_LASTERROR);

diff --git a/ircd/s_misc.c b/ircd/s_misc.c
index 1c6a2c408ab4105df5b4891e3fffdb22372f8bd5..1371be9423f53f73b9d6627d4772a102971bf517 100644 (file)
--- a/ircd/s_misc.c
+++ b/ircd/s_misc.c
@@ -52,7 +52,6 @@
 #include "s_user.h"
 #include "send.h"
 #include "struct.h"
-#include "support.h"
 #include "sys.h"
 #include "uping.h"
 #include "userload.h"

diff --git a/ircd/s_user.c b/ircd/s_user.c
index a6df6f1e17374a498d49c9e7d2005e5f3a7db83e..268e38a38dffa12fb4c3ddd666032045d87d526c 100644 (file)
--- a/ircd/s_user.c
+++ b/ircd/s_user.c
@@ -58,7 +58,6 @@
 #include "s_serv.h" /* max_client_count */
 #include "send.h"
 #include "struct.h"
-#include "support.h"
 #include "supported.h"
 #include "sys.h"
 #include "userload.h"

diff --git a/ircd/support.c b/ircd/support.c
deleted file mode 100644 (file)
index dae19e0..0000000
--- a/ircd/support.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * IRC - Internet Relay Chat, common/support.c
- * Copyright (C) 1990, 1991 Armin Gruner
- *
- * 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 1, 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., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * $Id$
- */
-#include "config.h"
-
-#include "support.h"
-#include "fileio.h"
-#include "ircd.h"
-#include "ircd_chattr.h"
-#include "ircd_snprintf.h"
-#include "s_bsd.h"
-#include "s_debug.h"
-#include "send.h"
-#include "sys.h"
-
-#include <signal.h>   /* kill */
-#include <stdarg.h>
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
-
-int check_if_ipmask(const char *mask)
-{
-  int has_digit = 0;
-  const char *p;
-
-  for (p = mask; *p; ++p)
-    if (*p != '*' && *p != '?' && *p != '.' && *p != '/')
-    {
-      if (!IsDigit(*p))
-        return 0;
-      has_digit = -1;
-    }
-
-  return has_digit;
-}
-
-/* Moved from logf() in whocmds.c to here. Modified a 
- * bit and used for most logging now.
- *  -Ghostwolf 12-Jul-99
- */
-
-extern void write_log(const char *filename, const char *pattern, ...)
-{
-  FBFILE *logfile;
-  va_list vl;
-  static char logbuf[1024];
-
-  logfile = fbopen(filename, "a");
-
-  if (logfile)
-  {
-    va_start(vl, pattern);
-    ircd_vsnprintf(0, logbuf, sizeof(logbuf) - 1, pattern, vl);
-    va_end(vl);
-
-    fbputs(logbuf, logfile);
-    fbclose(logfile);
-  }
-}

diff --git a/ircd/whocmds.c b/ircd/whocmds.c
index 3e40dace532f24d7b12f4f99b2ae63dbacda9cbf..bbfa7ad380872c90b9e6155ace0880bacd5d6d17 100644 (file)
--- a/ircd/whocmds.c
+++ b/ircd/whocmds.c
@@ -46,7 +46,6 @@
 #include "s_user.h"
 #include "send.h"
 #include "struct.h"
-#include "support.h"
 #include "sys.h"
 #include "userload.h"
 #include "version.h"

diff --git a/ircd/whowas.c b/ircd/whowas.c
index 2aa93998d2341d260c208257011dce10fbc398cc..5b72be0ec98ee649ca8f4b51c194ed2d52885da9 100644 (file)
--- a/ircd/whowas.c
+++ b/ircd/whowas.c
@@ -50,7 +50,6 @@
 #include "s_user.h"
 #include "send.h"
 #include "struct.h"
-#include "support.h"
 #include "sys.h"
 #include "msg.h"