From 6b4777173aa264b36bb37d516179f44f6d922c57 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Thu, 4 Oct 2012 05:01:29 +0000 Subject: [PATCH] Use compatibility framework instead of atheme API directly. --- atheme-compat.h | 2 +- backtrace.c | 2 +- cs_access_alias.c | 2 +- cs_babbler.c | 2 +- cs_badwords.c | 2 +- cs_fregister.c | 2 +- cs_kickdots.c | 2 +- cs_ping.c | 2 +- cs_regmode.c | 2 +- cs_regnotice.c | 2 +- cs_updown.c | 2 +- cs_userinfo.c | 2 +- dnsbl.c | 2 +- gen_echoserver.c | 2 +- gen_listenerdemo.c | 2 +- gen_vhostonreg.c | 2 +- graphtastical.c | 2 +- gs_roulette.c | 2 +- ircd_announceserv.c | 2 +- ircd_catserv.c | 2 +- ircd_loveserv.c | 2 +- mlocktweaker.c | 2 +- ms_fsend.c | 2 +- ns_ajoin.c | 2 +- ns_cleannick.c | 2 +- ns_fenforce.c | 2 +- ns_forbid.c | 2 +- ns_fregister.c | 2 +- ns_generatehash.c | 2 +- ns_generatepass.c | 2 +- ns_guestnoreg.c | 2 +- ns_listlogins.c | 2 +- ns_mxcheck.c | 2 +- ns_mxcheck_async.c | 2 +- ns_regnotice.c | 2 +- ns_waitreg.c | 2 +- on_db_save.c | 2 +- os_akillnicklist.c | 2 +- os_defcon.c | 2 +- os_helpme.c | 2 +- os_joinmon.c | 2 +- os_kill.c | 2 +- os_klinechan.c | 2 +- os_modeall.c | 2 +- os_pingspam.c | 2 +- os_procwatch.c | 2 +- os_resolve.c | 2 +- os_savechanmodes.c | 2 +- os_tabletest.c | 2 +- os_testcmd.c | 2 +- os_testproc.c | 2 +- os_trace.c | 2 +- wumpus.c | 2 +- 53 files changed, 53 insertions(+), 53 deletions(-) diff --git a/atheme-compat.h b/atheme-compat.h index dd5b386..567745d 100644 --- a/atheme-compat.h +++ b/atheme-compat.h @@ -28,7 +28,7 @@ * of Atheme to compile a subset of the Atheme 7.1 API, if such API features * are unavailable. */ -#ifdef CURRENT_ABI_REVISION < 710000 +#if CURRENT_ABI_REVISION < 710000 typedef char *stringref; #endif diff --git a/backtrace.c b/backtrace.c index edc9c99..1682a71 100644 --- a/backtrace.c +++ b/backtrace.c @@ -1,4 +1,4 @@ -#include "atheme.h" +#include "atheme-compat.h" #ifdef __Linux__ #include diff --git a/cs_access_alias.c b/cs_access_alias.c index 0382a96..fe2211a 100644 --- a/cs_access_alias.c +++ b/cs_access_alias.c @@ -7,7 +7,7 @@ * $Id$ */ -#include "atheme.h" +#include "atheme-compat.h" #include "template.h" DECLARE_MODULE_V1 diff --git a/cs_babbler.c b/cs_babbler.c index 4af89fd..06751af 100644 --- a/cs_babbler.c +++ b/cs_babbler.c @@ -34,7 +34,7 @@ * bad idea. */ -#include "atheme.h" +#include "atheme-compat.h" DECLARE_MODULE_V1 ( diff --git a/cs_badwords.c b/cs_badwords.c index a8d7725..ac2b065 100644 --- a/cs_badwords.c +++ b/cs_badwords.c @@ -4,7 +4,7 @@ * */ -#include "atheme.h" +#include "atheme-compat.h" DECLARE_MODULE_V1 ( diff --git a/cs_fregister.c b/cs_fregister.c index ca1dd87..76b38d5 100644 --- a/cs_fregister.c +++ b/cs_fregister.c @@ -6,7 +6,7 @@ * */ -#include "atheme.h" +#include "atheme-compat.h" #include "../chanserv/chanserv.h" DECLARE_MODULE_V1 diff --git a/cs_kickdots.c b/cs_kickdots.c index 18dcaae..8414dc3 100644 --- a/cs_kickdots.c +++ b/cs_kickdots.c @@ -6,7 +6,7 @@ * */ -#include "atheme.h" +#include "atheme-compat.h" DECLARE_MODULE_V1 ( diff --git a/cs_ping.c b/cs_ping.c index eced2b5..cbead3f 100644 --- a/cs_ping.c +++ b/cs_ping.c @@ -1,4 +1,4 @@ -#include "atheme.h" +#include "atheme-compat.h" DECLARE_MODULE_V1 ( diff --git a/cs_regmode.c b/cs_regmode.c index e1c7deb..de39dab 100644 --- a/cs_regmode.c +++ b/cs_regmode.c @@ -5,7 +5,7 @@ * Set/unset DALnet channel mode +r on registration/deregistration. */ -#include "atheme.h" +#include "atheme-compat.h" DECLARE_MODULE_V1 ( diff --git a/cs_regnotice.c b/cs_regnotice.c index 6976d19..347c42f 100644 --- a/cs_regnotice.c +++ b/cs_regnotice.c @@ -5,7 +5,7 @@ * Sends a customized welcome message on channel registration. */ -#include "atheme.h" +#include "atheme-compat.h" #include "conf.h" DECLARE_MODULE_V1 diff --git a/cs_updown.c b/cs_updown.c index 879d1d1..c4c9c0f 100644 --- a/cs_updown.c +++ b/cs_updown.c @@ -6,7 +6,7 @@ * */ -#include "atheme.h" +#include "atheme-compat.h" DECLARE_MODULE_V1 ( diff --git a/cs_userinfo.c b/cs_userinfo.c index 5bd420e..d470b4d 100644 --- a/cs_userinfo.c +++ b/cs_userinfo.c @@ -6,7 +6,7 @@ * */ -#include "atheme.h" +#include "atheme-compat.h" DECLARE_MODULE_V1 ( diff --git a/dnsbl.c b/dnsbl.c index 78d7127..bc82263 100644 --- a/dnsbl.c +++ b/dnsbl.c @@ -41,7 +41,7 @@ * }; */ -#include "atheme.h" +#include "atheme-compat.h" #include "conf.h" DECLARE_MODULE_V1 diff --git a/gen_echoserver.c b/gen_echoserver.c index 9f64470..0bc3347 100644 --- a/gen_echoserver.c +++ b/gen_echoserver.c @@ -6,7 +6,7 @@ * */ -#include "atheme.h" +#include "atheme-compat.h" #include "datastream.h" DECLARE_MODULE_V1 diff --git a/gen_listenerdemo.c b/gen_listenerdemo.c index ee663e3..2bc9e08 100644 --- a/gen_listenerdemo.c +++ b/gen_listenerdemo.c @@ -6,7 +6,7 @@ * */ -#include "atheme.h" +#include "atheme-compat.h" #include "datastream.h" DECLARE_MODULE_V1 diff --git a/gen_vhostonreg.c b/gen_vhostonreg.c index bce4a31..db14ef0 100644 --- a/gen_vhostonreg.c +++ b/gen_vhostonreg.c @@ -6,7 +6,7 @@ * */ -#include "atheme.h" +#include "atheme-compat.h" DECLARE_MODULE_V1 ( diff --git a/graphtastical.c b/graphtastical.c index 633e4c0..1409adc 100644 --- a/graphtastical.c +++ b/graphtastical.c @@ -34,7 +34,7 @@ * privacy concerns; you probably shouldn't. */ -#include "atheme.h" +#include "atheme-compat.h" DECLARE_MODULE_V1 ( diff --git a/gs_roulette.c b/gs_roulette.c index d136bec..618994f 100644 --- a/gs_roulette.c +++ b/gs_roulette.c @@ -6,7 +6,7 @@ * */ -#include "atheme.h" +#include "atheme-compat.h" DECLARE_MODULE_V1 ( diff --git a/ircd_announceserv.c b/ircd_announceserv.c index 4f29020..2a6bf77 100644 --- a/ircd_announceserv.c +++ b/ircd_announceserv.c @@ -5,7 +5,7 @@ * This file contains the main() routine. */ -#include "atheme.h" +#include "atheme-compat.h" DECLARE_MODULE_V1 ( diff --git a/ircd_catserv.c b/ircd_catserv.c index c05a0ce..0d9d266 100644 --- a/ircd_catserv.c +++ b/ircd_catserv.c @@ -6,7 +6,7 @@ * */ -#include "atheme.h" +#include "atheme-compat.h" DECLARE_MODULE_V1 ( diff --git a/ircd_loveserv.c b/ircd_loveserv.c index 44e01ca..ccf49c7 100644 --- a/ircd_loveserv.c +++ b/ircd_loveserv.c @@ -6,7 +6,7 @@ * */ -#include "atheme.h" +#include "atheme-compat.h" DECLARE_MODULE_V1 ( diff --git a/mlocktweaker.c b/mlocktweaker.c index b3fbf61..72a4aad 100644 --- a/mlocktweaker.c +++ b/mlocktweaker.c @@ -6,7 +6,7 @@ * */ -#include "atheme.h" +#include "atheme-compat.h" /* * Set this to the string of mlock changes you want to make. diff --git a/ms_fsend.c b/ms_fsend.c index c2a3e52..a7a7cf8 100644 --- a/ms_fsend.c +++ b/ms_fsend.c @@ -6,7 +6,7 @@ * */ -#include "atheme.h" +#include "atheme-compat.h" /* MEMOLEN + 8, so the "[FORCE] " string will fit */ #define FMEMOLEN 308 diff --git a/ns_ajoin.c b/ns_ajoin.c index 2946cc3..22da235 100644 --- a/ns_ajoin.c +++ b/ns_ajoin.c @@ -7,7 +7,7 @@ * */ -#include "atheme.h" +#include "atheme-compat.h" #include "uplink.h" DECLARE_MODULE_V1 diff --git a/ns_cleannick.c b/ns_cleannick.c index 82cfd62..7e8bb11 100644 --- a/ns_cleannick.c +++ b/ns_cleannick.c @@ -5,7 +5,7 @@ * Clean obnoxious nicknames, such as LaMENiCK -> lamenick. */ -#include "atheme.h" +#include "atheme-compat.h" DECLARE_MODULE_V1 ( diff --git a/ns_fenforce.c b/ns_fenforce.c index cd9800b..5fd91e5 100644 --- a/ns_fenforce.c +++ b/ns_fenforce.c @@ -5,7 +5,7 @@ * This file contains code for the NickServ FENFORCE function. */ -#include "atheme.h" +#include "atheme-compat.h" DECLARE_MODULE_V1 ( diff --git a/ns_forbid.c b/ns_forbid.c index f48f9aa..6c69e15 100644 --- a/ns_forbid.c +++ b/ns_forbid.c @@ -5,7 +5,7 @@ * This file contains code for the NickServ FORBID function. */ -#include "atheme.h" +#include "atheme-compat.h" DECLARE_MODULE_V1 ( diff --git a/ns_fregister.c b/ns_fregister.c index 2feb172..54d4188 100644 --- a/ns_fregister.c +++ b/ns_fregister.c @@ -9,7 +9,7 @@ * */ -#include "atheme.h" +#include "atheme-compat.h" DECLARE_MODULE_V1 ( diff --git a/ns_generatehash.c b/ns_generatehash.c index 25d63fb..37d4c5b 100644 --- a/ns_generatehash.c +++ b/ns_generatehash.c @@ -6,7 +6,7 @@ * */ -#include "atheme.h" +#include "atheme-compat.h" DECLARE_MODULE_V1 ( diff --git a/ns_generatepass.c b/ns_generatepass.c index 3fecd70..9d2e90e 100644 --- a/ns_generatepass.c +++ b/ns_generatepass.c @@ -6,7 +6,7 @@ * */ -#include "atheme.h" +#include "atheme-compat.h" DECLARE_MODULE_V1 ( diff --git a/ns_guestnoreg.c b/ns_guestnoreg.c index eb767ab..712dbf1 100644 --- a/ns_guestnoreg.c +++ b/ns_guestnoreg.c @@ -14,7 +14,7 @@ * */ -#include "atheme.h" +#include "atheme-compat.h" #include "conf.h" DECLARE_MODULE_V1 diff --git a/ns_listlogins.c b/ns_listlogins.c index 217ea31..7e91d00 100644 --- a/ns_listlogins.c +++ b/ns_listlogins.c @@ -5,7 +5,7 @@ * This file contains code for the NickServ LISTLOGINS function. */ -#include "atheme.h" +#include "atheme-compat.h" DECLARE_MODULE_V1 ( diff --git a/ns_mxcheck.c b/ns_mxcheck.c index ee191de..87bea9e 100644 --- a/ns_mxcheck.c +++ b/ns_mxcheck.c @@ -1,4 +1,4 @@ -#include "atheme.h" +#include "atheme-compat.h" #ifndef _WIN32 diff --git a/ns_mxcheck_async.c b/ns_mxcheck_async.c index 882eb05..cd724c2 100644 --- a/ns_mxcheck_async.c +++ b/ns_mxcheck_async.c @@ -1,4 +1,4 @@ -#include "atheme.h" +#include "atheme-compat.h" #ifndef _WIN32 diff --git a/ns_regnotice.c b/ns_regnotice.c index 9cec565..801c3b1 100644 --- a/ns_regnotice.c +++ b/ns_regnotice.c @@ -5,7 +5,7 @@ * Sends a customized welcome message on nickname registration. */ -#include "atheme.h" +#include "atheme-compat.h" #include "conf.h" DECLARE_MODULE_V1 diff --git a/ns_waitreg.c b/ns_waitreg.c index 97eeb7b..4ba5e74 100644 --- a/ns_waitreg.c +++ b/ns_waitreg.c @@ -5,7 +5,7 @@ * This file contains code for delaying user registration */ -#include "atheme.h" +#include "atheme-compat.h" #include "conf.h" #include diff --git a/on_db_save.c b/on_db_save.c index d86cc23..47aacb0 100644 --- a/on_db_save.c +++ b/on_db_save.c @@ -1,4 +1,4 @@ -#include "atheme.h" +#include "atheme-compat.h" #include "conf.h" #include "datastream.h" diff --git a/os_akillnicklist.c b/os_akillnicklist.c index 08dba3a..6eb2635 100644 --- a/os_akillnicklist.c +++ b/os_akillnicklist.c @@ -24,7 +24,7 @@ * Thanks for reading my crappy docs, and have a nice day. */ -#include "atheme.h" +#include "atheme-compat.h" DECLARE_MODULE_V1 ( diff --git a/os_defcon.c b/os_defcon.c index 83b4e99..c4117ed 100644 --- a/os_defcon.c +++ b/os_defcon.c @@ -10,7 +10,7 @@ * setting to time out/expire. * */ -#include "atheme.h" +#include "atheme-compat.h" #define DEFCON_CMODE "R" DECLARE_MODULE_V1 diff --git a/os_helpme.c b/os_helpme.c index 3ac6282..f56b7d5 100644 --- a/os_helpme.c +++ b/os_helpme.c @@ -2,7 +2,7 @@ * elly+atheme@leptoquark.net */ -#include "atheme.h" +#include "atheme-compat.h" #include "uplink.h" /* sts() */ diff --git a/os_joinmon.c b/os_joinmon.c index 3c4f842..1f35842 100644 --- a/os_joinmon.c +++ b/os_joinmon.c @@ -6,7 +6,7 @@ * */ -#include "atheme.h" +#include "atheme-compat.h" DECLARE_MODULE_V1 ( diff --git a/os_kill.c b/os_kill.c index 70ccaf8..3a0715c 100644 --- a/os_kill.c +++ b/os_kill.c @@ -10,7 +10,7 @@ * but would not remove the user, but the user cannot (fully) reconnect. */ -#include "atheme.h" +#include "atheme-compat.h" DECLARE_MODULE_V1 ( diff --git a/os_klinechan.c b/os_klinechan.c index 073feb6..939207a 100644 --- a/os_klinechan.c +++ b/os_klinechan.c @@ -6,7 +6,7 @@ * */ -#include "atheme.h" +#include "atheme-compat.h" DECLARE_MODULE_V1 ( diff --git a/os_modeall.c b/os_modeall.c index bd03a8d..060eff6 100644 --- a/os_modeall.c +++ b/os_modeall.c @@ -7,7 +7,7 @@ * */ -#include "atheme.h" +#include "atheme-compat.h" DECLARE_MODULE_V1 ( diff --git a/os_pingspam.c b/os_pingspam.c index 3390200..55ed895 100644 --- a/os_pingspam.c +++ b/os_pingspam.c @@ -6,7 +6,7 @@ * */ -#include "atheme.h" +#include "atheme-compat.h" DECLARE_MODULE_V1 ( diff --git a/os_procwatch.c b/os_procwatch.c index 0bd7412..653a4eb 100644 --- a/os_procwatch.c +++ b/os_procwatch.c @@ -6,7 +6,7 @@ * The kqueue is added to the main poll loop. */ -#include "atheme.h" +#include "atheme-compat.h" #ifdef __FreeBSD__ #include diff --git a/os_resolve.c b/os_resolve.c index 6252f9e..3de17ab 100644 --- a/os_resolve.c +++ b/os_resolve.c @@ -5,7 +5,7 @@ * Does an A record lookup. */ -#include "atheme.h" +#include "atheme-compat.h" DECLARE_MODULE_V1 ( diff --git a/os_savechanmodes.c b/os_savechanmodes.c index 4fce955..94fa124 100644 --- a/os_savechanmodes.c +++ b/os_savechanmodes.c @@ -5,7 +5,7 @@ * Dump/restore channel modes */ -#include "atheme.h" +#include "atheme-compat.h" DECLARE_MODULE_V1 ( diff --git a/os_tabletest.c b/os_tabletest.c index 252a5a9..25f3b87 100644 --- a/os_tabletest.c +++ b/os_tabletest.c @@ -1,4 +1,4 @@ -#include "atheme.h" +#include "atheme-compat.h" DECLARE_MODULE_V1 ( diff --git a/os_testcmd.c b/os_testcmd.c index 14f1ea6..c1f25af 100644 --- a/os_testcmd.c +++ b/os_testcmd.c @@ -6,7 +6,7 @@ * */ -#include "atheme.h" +#include "atheme-compat.h" DECLARE_MODULE_V1 ( diff --git a/os_testproc.c b/os_testproc.c index 7a50058..75aeea1 100644 --- a/os_testproc.c +++ b/os_testproc.c @@ -5,7 +5,7 @@ * Reads data from a child process via a pipe. */ -#include "atheme.h" +#include "atheme-compat.h" #include "datastream.h" #ifndef _WIN32 diff --git a/os_trace.c b/os_trace.c index fab298e..064b8ff 100644 --- a/os_trace.c +++ b/os_trace.c @@ -5,7 +5,7 @@ * Looks for users and performs actions on them. */ -#include "atheme.h" +#include "atheme-compat.h" #include DECLARE_MODULE_V1 diff --git a/wumpus.c b/wumpus.c index acd95c4..8c3c21c 100644 --- a/wumpus.c +++ b/wumpus.c @@ -9,7 +9,7 @@ * */ -#include "atheme.h" +#include "atheme-compat.h" DECLARE_MODULE_V1 (