summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changes5
-rw-r--r--include/extern.h1
-rw-r--r--src/modules.c11
-rw-r--r--src/nickserv.c6
-rw-r--r--version.log8
5 files changed, 21 insertions, 10 deletions
diff --git a/Changes b/Changes
index 7252f8ea5..e85f83033 100644
--- a/Changes
+++ b/Changes
@@ -19,7 +19,10 @@ Provided by Anope Dev. <dev@anope.org> - 2006
03/01 F Fixed wasteful finduser() call in os_oline.c [#457]
03/01 F Fixed memleak in runDefCon(). [#451]
03/01 F Fixed function type of get_xop_level. [#459]
-03/01 F Prevented registration of UnrealIRCd's local channels. [#456]
+03/01 F Prevented registration of UnrealIRCd's "local" channels. [#456]
+03/01 F Fixed bug in moduleNoticeLang(). [#421]
+03/01 F Made should_mode_change() extern. [#436]
+03/01 F Made add_ns_timeout() static. [#438]
Provided by nenolod. <nenolod@nenolod.net> - 2006
02/03 A Support for Charybdis IRCd. [ #00]
diff --git a/include/extern.h b/include/extern.h
index 2f49de5a7..2336b8d80 100644
--- a/include/extern.h
+++ b/include/extern.h
@@ -881,6 +881,7 @@ E void del_ns_timeout(NickAlias * na, int type);
E void change_core_display(NickCore * nc, char *newdisplay);
E void release(NickAlias * na, int from_timeout);
E int do_setmodes(User * u);
+E int should_mode_change(int16 status, int16 mode);
E void ns_init(void);
E void nickserv(User * u, char *buf);
diff --git a/src/modules.c b/src/modules.c
index 5eae6c0ff..642f53659 100644
--- a/src/modules.c
+++ b/src/modules.c
@@ -2550,18 +2550,17 @@ void moduleNoticeLang(char *source, User * u, int number, ...)
fmt = mod_current_module->lang[lang].argv[number];
buf = sstrdup(fmt);
- s = buf;
+ va_start(va, number);
+ vsnprintf(buffer, 4095, outbuf, va);
+ va_end(va);
+ s = buffer;
while (*s) {
t = s;
s += strcspn(s, "\n");
if (*s)
*s++ = '\0';
strscpy(outbuf, t, sizeof(outbuf));
-
- va_start(va, number);
- vsnprintf(buffer, 4095, outbuf, va);
- va_end(va);
- notice(source, u->nick, buffer);
+ notice(source, u->nick, outbuf);
}
free(buf);
} else {
diff --git a/src/nickserv.c b/src/nickserv.c
index 9a354f2be..fe2081d7f 100644
--- a/src/nickserv.c
+++ b/src/nickserv.c
@@ -46,6 +46,7 @@ int delnickrequest(NickRequest * nr);
NickRequest *findrequestnick(const char *nick);
int do_setmodes(User * u);
+int should_mode_change(int16 status, int16 mode);
/*************************************************************************/
/* *INDENT-OFF* */
@@ -1721,7 +1722,7 @@ static void timeout_release(Timeout * t)
/* Add a collide/release timeout. */
-void add_ns_timeout(NickAlias * na, int type, time_t delay)
+static void add_ns_timeout(NickAlias * na, int type, time_t delay)
{
Timeout *to;
struct my_timeout *t;
@@ -1817,6 +1818,9 @@ void clean_ns_timeouts(NickAlias * na)
/*************************************************************************/
/*********************** NickServ command routines ***********************/
/*************************************************************************/
+
+
+/* We don't use this function but we keep it for module coders -certus */
int should_mode_change(int16 status, int16 mode)
{
switch (mode) {
diff --git a/version.log b/version.log
index b8ef51b8f..355af3f03 100644
--- a/version.log
+++ b/version.log
@@ -9,13 +9,17 @@ VERSION_MAJOR="1"
VERSION_MINOR="7"
VERSION_PATCH="13"
VERSION_EXTRA="-svn"
-VERSION_BUILD="987"
+VERSION_BUILD="988"
# $Log$
#
+# BUILD : 1.7.13 (988)
+# BUGS : 421 436 438
+# NOTES : Hooray, it's still bug-fixing-day!
+#
# BUILD : 1.7.13 (987)
# BUGS : 456
-# NOTES : Added fix for unreal's local channels
+# NOTES : Added fix for unreal's "local" channels
#
# BUILD : 1.7.13 (986)
# BUGS : n/a