From 29a0ae1871aabcaa28fdc88099ec4e803d4c87bf Mon Sep 17 00:00:00 2001 From: codemastr Date: Mon, 2 Jul 2001 17:59:29 +0000 Subject: [PATCH] removed a few missed userload.h references --- Changes | 1 + include/struct.h | 63 ---------------------------------------- src/modules/l_commands.c | 1 - src/modules/m_chghost.c | 1 - src/modules/m_chgident.c | 1 - src/modules/m_dummy.c | 1 - src/modules/m_sdesc.c | 1 - src/modules/m_sethost.c | 1 - src/modules/m_setident.c | 1 - src/modules/m_setname.c | 1 - src/modules/m_svsmode.c | 1 - src/modules/m_svsmotd.c | 1 - src/modules/m_swhois.c | 1 - src/modules/scan_dummy.c | 1 - src/modules/scan_socks.c | 1 - src/win32/Win32GUI.c | 1 - 16 files changed, 1 insertion(+), 77 deletions(-) diff --git a/Changes b/Changes index 007f85780..b9a05f965 100644 --- a/Changes +++ b/Changes @@ -644,3 +644,4 @@ seen. gmtime warning still there - Random cosmetic fixes - Updated the stats help list for newconf - Removed include/userload.h (not used) +- Removed a few missed userload.h references diff --git a/include/struct.h b/include/struct.h index 95b42d2eb..61a364bb1 100644 --- a/include/struct.h +++ b/include/struct.h @@ -626,69 +626,6 @@ typedef struct Whowas { struct Whowas *cprev; /* for client struct linked list */ } aWhowas; - -#ifdef OLD - -struct ConfItem { - unsigned int status; /* If CONF_ILLEGAL, delete when no clients */ - int clients; /* Number of *LOCAL* clients using this */ - struct IN_ADDR ipnum; /* ip number of host field */ - char *host; - char *passwd; - char *name; - int port; - TS hold; /* Hold action until this time (calendar time) */ - int tmpconf; -#ifndef VMSP - aClass *class; /* Class of connection */ -#endif - short options; - struct ConfItem *next; -}; -#endif -#define CONF_ILLEGAL 0x80000000 -#define CONF_MATCH 0x40000000 -#define CONF_QUARANTINED_SERVER 0x0001 -#define CONF_CLIENT 0x0002 -#define CONF_CONNECT_SERVER 0x0004 -#define CONF_NOCONNECT_SERVER 0x0008 -#define CONF_LOCOP 0x0010 -#define CONF_OPERATOR 0x0020 -#define CONF_ME 0x0040 -#define CONF_KILL 0x0080 -#define CONF_ADMIN 0x0100 -#ifdef R_LINES -#define CONF_RESTRICT 0x0200 -#endif -#define CONF_CLASS 0x0400 -#define CONF_SERVICE 0x0800 -#define CONF_LEAF 0x1000 -#define CONF_LISTEN_PORT 0x2000 -#define CONF_HUB 0x4000 -#define CONF_UWORLD 0x8000 -#define CONF_QUARANTINED_NICK 0x10000 -#define CONF_ZAP 0x20000 -#define CONF_CONFIG 0x100000 -#define CONF_CRULEALL 0x200000 -#define CONF_CRULEAUTO 0x400000 -#define CONF_MISSING 0x800000 -#define CONF_SADMIN 0x1000000 -#define CONF_DRPASS 0x2000000 /* DIE/RESTART pass - NikB */ -#define CONF_EXCEPT 0x4000000 /* K:Line exception */ -#define CONF_TLINE 0x8000000 /* T:Line */ -#define CONF_SOCKSEXCEPT 0x10000000 -#define CONF_NLINE 0x20000000 -#define CONF_VERSION 0x40000000 -#define CONF_OPS (CONF_OPERATOR | CONF_LOCOP) -#define CONF_SERVER_MASK (CONF_CONNECT_SERVER | CONF_NOCONNECT_SERVER) -#define CONF_CLIENT_MASK (CONF_CLIENT | CONF_SERVICE | CONF_OPS | \ - CONF_SERVER_MASK) -#define CONF_CRULE (CONF_CRULEALL | CONF_CRULEAUTO) -#define CONF_QUARANTINE (CONF_QUARANTINED_SERVER|CONF_QUARANTINED_NICK) - -#define IsIllegal(x) ((x)->status & CONF_ILLEGAL) -#define IsTemp(x) ((x)->tmpconf) - /* * Client structures */ diff --git a/src/modules/l_commands.c b/src/modules/l_commands.c index 64e42c211..1c38aa8a2 100644 --- a/src/modules/l_commands.c +++ b/src/modules/l_commands.c @@ -25,7 +25,6 @@ #include "numeric.h" #include "msg.h" #include "channel.h" -#include "userload.h" #include #include #include diff --git a/src/modules/m_chghost.c b/src/modules/m_chghost.c index 3bb23d436..c8de94403 100644 --- a/src/modules/m_chghost.c +++ b/src/modules/m_chghost.c @@ -26,7 +26,6 @@ #include "numeric.h" #include "msg.h" #include "channel.h" -#include "userload.h" #include #include #include diff --git a/src/modules/m_chgident.c b/src/modules/m_chgident.c index 223885a87..f6acc59ca 100644 --- a/src/modules/m_chgident.c +++ b/src/modules/m_chgident.c @@ -26,7 +26,6 @@ #include "numeric.h" #include "msg.h" #include "channel.h" -#include "userload.h" #include #include #include diff --git a/src/modules/m_dummy.c b/src/modules/m_dummy.c index 60d6133b2..906a5e3a5 100644 --- a/src/modules/m_dummy.c +++ b/src/modules/m_dummy.c @@ -10,7 +10,6 @@ #include "numeric.h" #include "msg.h" #include "channel.h" -#include "userload.h" #include #include #include diff --git a/src/modules/m_sdesc.c b/src/modules/m_sdesc.c index 4d4da319f..94dd12616 100644 --- a/src/modules/m_sdesc.c +++ b/src/modules/m_sdesc.c @@ -26,7 +26,6 @@ #include "numeric.h" #include "msg.h" #include "channel.h" -#include "userload.h" #include #include #include diff --git a/src/modules/m_sethost.c b/src/modules/m_sethost.c index 1985b1a73..18b8613df 100644 --- a/src/modules/m_sethost.c +++ b/src/modules/m_sethost.c @@ -26,7 +26,6 @@ #include "numeric.h" #include "msg.h" #include "channel.h" -#include "userload.h" #include #include #include diff --git a/src/modules/m_setident.c b/src/modules/m_setident.c index 491d628de..66ec3b4aa 100644 --- a/src/modules/m_setident.c +++ b/src/modules/m_setident.c @@ -26,7 +26,6 @@ #include "numeric.h" #include "msg.h" #include "channel.h" -#include "userload.h" #include #include #include diff --git a/src/modules/m_setname.c b/src/modules/m_setname.c index 840b26064..2bea49e76 100644 --- a/src/modules/m_setname.c +++ b/src/modules/m_setname.c @@ -26,7 +26,6 @@ #include "numeric.h" #include "msg.h" #include "channel.h" -#include "userload.h" #include #include #include diff --git a/src/modules/m_svsmode.c b/src/modules/m_svsmode.c index 75d2b6ad0..fbdfdde6b 100644 --- a/src/modules/m_svsmode.c +++ b/src/modules/m_svsmode.c @@ -28,7 +28,6 @@ #include "numeric.h" #include "msg.h" #include "channel.h" -#include "userload.h" #include #include #include diff --git a/src/modules/m_svsmotd.c b/src/modules/m_svsmotd.c index 310f80855..76edd0e04 100644 --- a/src/modules/m_svsmotd.c +++ b/src/modules/m_svsmotd.c @@ -28,7 +28,6 @@ #include "numeric.h" #include "msg.h" #include "channel.h" -#include "userload.h" #include #include #include diff --git a/src/modules/m_swhois.c b/src/modules/m_swhois.c index 687ae8471..e4118b5b2 100644 --- a/src/modules/m_swhois.c +++ b/src/modules/m_swhois.c @@ -28,7 +28,6 @@ #include "numeric.h" #include "msg.h" #include "channel.h" -#include "userload.h" #include #include #include diff --git a/src/modules/scan_dummy.c b/src/modules/scan_dummy.c index 9eb418c2e..11bdf40c2 100644 --- a/src/modules/scan_dummy.c +++ b/src/modules/scan_dummy.c @@ -10,7 +10,6 @@ #include "numeric.h" #include "msg.h" #include "channel.h" -#include "userload.h" #include #include #include diff --git a/src/modules/scan_socks.c b/src/modules/scan_socks.c index 723c42c36..2b7ae92b7 100644 --- a/src/modules/scan_socks.c +++ b/src/modules/scan_socks.c @@ -29,7 +29,6 @@ #include "numeric.h" #include "msg.h" #include "channel.h" -#include "userload.h" #include #include #include diff --git a/src/win32/Win32GUI.c b/src/win32/Win32GUI.c index 65f23febf..beed084c5 100644 --- a/src/win32/Win32GUI.c +++ b/src/win32/Win32GUI.c @@ -34,7 +34,6 @@ #include "common.h" #include "sys.h" #include "numeric.h" -#include "userload.h" #include #include #include