summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile4
-rw-r--r--src/botserv.c5
-rw-r--r--src/chanserv.c6
-rw-r--r--src/core/os_news.c2
-rw-r--r--src/hostserv.c4
-rw-r--r--src/init.c7
-rw-r--r--src/log.c1
-rw-r--r--src/main.c1
-rw-r--r--src/memoserv.c3
-rw-r--r--src/messages.c4
-rw-r--r--src/nickcore.cpp2
-rw-r--r--src/nickserv.c5
-rw-r--r--src/operserv.c3
-rw-r--r--src/protocol/bahamut.c2
-rw-r--r--src/protocol/inspircd11.c4
-rw-r--r--src/protocol/inspircd12.cpp4
-rw-r--r--src/protocol/ratbox.c2
-rw-r--r--src/protocol/unreal32.c2
-rw-r--r--src/sessions.c3
19 files changed, 32 insertions, 32 deletions
diff --git a/src/Makefile b/src/Makefile
index c5dec5633..04d33b040 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -4,8 +4,8 @@ OBJS = actions.o base64.o bots.o botserv.o channels.o chanserv.o command.o comm
nickcore.o nickserv.o operserv.o process.o protocol.o regchannel.o send.o servers.o sessions.o slist.o \
sockets.o threadengine.o threadengine_pthread.o timers.o opertype.o users.o wildcard.o
-INCLUDES = ../include/commands.h ../include/defs.h ../include/language.h \
- ../include/pseudo.h ../include/sysconf.h ../include/config.h \
+INCLUDES = ../include/commands.h ../include/language.h \
+ ../include/sysconf.h ../include/config.h \
../include/services.h ../include/regchannel.h \
../include/timers.h ../include/extern.h \
../include/modules.h ../include/slist.h ../include/hashcomp.h \
diff --git a/src/botserv.c b/src/botserv.c
index ea675ea60..aefe37b08 100644
--- a/src/botserv.c
+++ b/src/botserv.c
@@ -14,9 +14,8 @@
/*************************************************************************/
#include "services.h"
-#include "pseudo.h"
-
-/*************************************************************************/
+#include "modules.h"
+#include "language.h"
static UserData *get_user_data(Channel * c, User * u);
diff --git a/src/chanserv.c b/src/chanserv.c
index 872055df1..7f5602ed1 100644
--- a/src/chanserv.c
+++ b/src/chanserv.c
@@ -14,10 +14,8 @@
/*************************************************************************/
#include "services.h"
-#include "pseudo.h"
-
-/*************************************************************************/
-/* *INDENT-OFF* */
+#include "modules.h"
+#include "language.h"
registered_channel_map RegisteredChannelList;
diff --git a/src/core/os_news.c b/src/core/os_news.c
index 30ae8a090..68cb827f9 100644
--- a/src/core/os_news.c
+++ b/src/core/os_news.c
@@ -14,6 +14,8 @@
#include "module.h"
+#define lenof(a) (sizeof(a) / sizeof(*(a)))
+
/* List of messages for each news type. This simplifies message sending. */
#define MSG_SYNTAX 0
diff --git a/src/hostserv.c b/src/hostserv.c
index e43da5c05..ec46cdc86 100644
--- a/src/hostserv.c
+++ b/src/hostserv.c
@@ -11,9 +11,9 @@
*
*/
-/*************************************************************************/
#include "services.h"
-#include "pseudo.h"
+#include "modules.h"
+#include "language.h"
E int do_hs_sync(NickCore * nc, char *vIdent, char *hostmask,
char *creator, time_t time);
diff --git a/src/init.c b/src/init.c
index 6a2698085..faa37764b 100644
--- a/src/init.c
+++ b/src/init.c
@@ -12,7 +12,8 @@
*/
#include "services.h"
-#include "pseudo.h"
+#include "modules.h"
+
Uplink *uplink_server;
extern void moduleAddMsgs();
@@ -194,13 +195,13 @@ int init_primary(int ac, char **av)
if (GetCommandLineArgument("version", 'v'))
{
- Alog(LOG_TERMINAL) << "Anope-" << version_number << version_flags << " -- " << version_build;
+ Alog(LOG_TERMINAL) << "Anope-" << version_number << " -- " << version_build;
return -1;
}
if (GetCommandLineArgument("help", 'h'))
{
- Alog(LOG_TERMINAL) << "Anope-" << version_number << version_flags << " -- " << version_build;
+ Alog(LOG_TERMINAL) << "Anope-" << version_number << " -- " << version_build;
Alog(LOG_TERMINAL) << "Anope IRC Services (http://www.anope.org)";
Alog(LOG_TERMINAL) << "Usage ./" << SERVICES_BIN << " [options] ...";
Alog(LOG_TERMINAL) << "-c, --config=filename.conf";
diff --git a/src/log.c b/src/log.c
index d77920cdf..bf5fd10fb 100644
--- a/src/log.c
+++ b/src/log.c
@@ -12,7 +12,6 @@
*/
#include "services.h"
-#include "pseudo.h"
static FILE *logfile;
diff --git a/src/main.c b/src/main.c
index 7a00e1e36..8b95d4a2c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -83,7 +83,6 @@ const char version_number_dotted[] = VERSION_STRING_DOTTED;
const char version_build[] =
"build #" BUILD ", compiled " __DATE__ " " __TIME__;
/* the space is needed cause if you build with nothing it will complain */
-const char version_flags[] = " " VER_OS;
/******** Local variables! ********/
diff --git a/src/memoserv.c b/src/memoserv.c
index 0d8765631..405813332 100644
--- a/src/memoserv.c
+++ b/src/memoserv.c
@@ -12,7 +12,8 @@
*/
#include "services.h"
-#include "pseudo.h"
+#include "modules.h"
+#include "language.h"
/*************************************************************************/
/* *INDENT-OFF* */
diff --git a/src/messages.c b/src/messages.c
index 7cf591a76..56351ea8f 100644
--- a/src/messages.c
+++ b/src/messages.c
@@ -277,8 +277,8 @@ int m_stats(const char *source, int ac, const char **av)
int m_version(const char *source, int ac, const char **av)
{
- if (source) ircdproto->SendNumeric(Config.ServerName, 351, source, "Anope-%s %s :%s - %s (%s) -- %s", version_number, Config.ServerName, ircd->name, version_flags,
- Config.EncModuleList.begin()->c_str(), version_build);
+ if (source)
+ ircdproto->SendNumeric(Config.ServerName, 351, source, "Anope-%s %s :%s -(%s) -- %s", version_number, Config.ServerName, ircd->name, Config.EncModuleList.begin()->c_str(), version_build);
return MOD_CONT;
}
diff --git a/src/nickcore.cpp b/src/nickcore.cpp
index cfca2eb2a..3becf8ab4 100644
--- a/src/nickcore.cpp
+++ b/src/nickcore.cpp
@@ -1,5 +1,5 @@
#include "services.h"
-#include "pseudo.h"
+#include "modules.h"
/** Default constructor
* @param display The display nick
diff --git a/src/nickserv.c b/src/nickserv.c
index 9dae3ac8d..be1ed5470 100644
--- a/src/nickserv.c
+++ b/src/nickserv.c
@@ -13,9 +13,8 @@
*/
#include "services.h"
-#include "pseudo.h"
-
-/*************************************************************************/
+#include "modules.h"
+#include "language.h"
nickalias_map NickAliasList;
nickcore_map NickCoreList;
diff --git a/src/operserv.c b/src/operserv.c
index 672176050..fda5f5fd8 100644
--- a/src/operserv.c
+++ b/src/operserv.c
@@ -12,7 +12,8 @@
*/
#include "services.h"
-#include "pseudo.h"
+#include "modules.h"
+#include "language.h"
/*************************************************************************/
diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c
index 744fc9608..14dc68cb5 100644
--- a/src/protocol/bahamut.c
+++ b/src/protocol/bahamut.c
@@ -14,7 +14,7 @@
/*************************************************************************/
#include "services.h"
-#include "pseudo.h"
+#include "modules.h"
IRCDVar myIrcd[] = {
{"Bahamut 1.8.x", /* ircd name */
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index 70a344fc3..4c698edad 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -14,7 +14,7 @@
/*************************************************************************/
#include "services.h"
-#include "pseudo.h"
+#include "modules.h"
#include "hashcomp.h"
#ifndef _WIN32
@@ -252,7 +252,7 @@ class InspIRCdProto : public IRCDProto
inspircd_cmd_pass(uplink_server->password);
SendServer(Me);
send_cmd(NULL, "BURST");
- send_cmd(Config.ServerName, "VERSION :Anope-%s %s :%s - %s (%s) -- %s", version_number, Config.ServerName, ircd->name, version_flags, Config.EncModuleList.begin()->c_str(), version_build);
+ send_cmd(Config.ServerName, "VERSION :Anope-%s %s :%s - (%s) -- %s", version_number, Config.ServerName, ircd->name, Config.EncModuleList.begin()->c_str(), version_build);
}
/* CHGIDENT */
diff --git a/src/protocol/inspircd12.cpp b/src/protocol/inspircd12.cpp
index dd416d032..e125f45d0 100644
--- a/src/protocol/inspircd12.cpp
+++ b/src/protocol/inspircd12.cpp
@@ -14,7 +14,7 @@
/*************************************************************************/
#include "services.h"
-#include "pseudo.h"
+#include "modules.h"
#include "hashcomp.h"
#ifndef _WIN32
@@ -256,7 +256,7 @@ class InspIRCdProto : public IRCDProto
inspircd_cmd_pass(uplink_server->password);
SendServer(Me);
send_cmd(TS6SID, "BURST");
- send_cmd(TS6SID, "VERSION :Anope-%s %s :%s - %s (%s) -- %s", version_number, Config.ServerName, ircd->name, version_flags, Config.EncModuleList.begin()->c_str(), version_build);
+ send_cmd(TS6SID, "VERSION :Anope-%s %s :%s - (%s) -- %s", version_number, Config.ServerName, ircd->name, Config.EncModuleList.begin()->c_str(), version_build);
}
/* CHGIDENT */
diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c
index 4b4b732cd..58ab14154 100644
--- a/src/protocol/ratbox.c
+++ b/src/protocol/ratbox.c
@@ -12,7 +12,7 @@
*/
#include "services.h"
-#include "pseudo.h"
+#include "modules.h"
static char *TS6UPLINK = NULL; // XXX is this needed?
diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c
index d63d2183a..b14c48343 100644
--- a/src/protocol/unreal32.c
+++ b/src/protocol/unreal32.c
@@ -14,7 +14,7 @@
/*************************************************************************/
#include "services.h"
-#include "pseudo.h"
+#include "modules.h"
IRCDVar myIrcd[] = {
{"UnrealIRCd 3.2.x", /* ircd name */
diff --git a/src/sessions.c b/src/sessions.c
index cfd81bc7b..cef071443 100644
--- a/src/sessions.c
+++ b/src/sessions.c
@@ -12,7 +12,8 @@
*/
#include "services.h"
-#include "pseudo.h"
+#include "modules.h"
+#include "language.h"
/*************************************************************************/
generated by cgit (git 2.34.1) at 2025-06-17 11:41:17 +0000