summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/sysconf.h.in5
-rw-r--r--src/bahamut.c32
-rw-r--r--src/base64.c2
-rw-r--r--src/channels.c2
-rw-r--r--src/chanserv.c3
-rw-r--r--src/dreamforge.c18
-rw-r--r--src/hybrid.c20
-rw-r--r--src/log.c12
-rw-r--r--src/modules.c2
-rw-r--r--src/nickserv.c11
-rw-r--r--src/ptlink.c26
-rw-r--r--src/rageircd.c27
-rw-r--r--src/timeout.c2
-rw-r--r--src/ultimate2.c18
-rw-r--r--src/ultimate3.c29
-rw-r--r--src/unreal31.c20
-rw-r--r--src/unreal32.c19
-rw-r--r--src/users.c6
-rw-r--r--src/viagra.c32
-rw-r--r--version.log6
20 files changed, 169 insertions, 123 deletions
diff --git a/include/sysconf.h.in b/include/sysconf.h.in
index dcb6f2dbe..b91fe641e 100644
--- a/include/sysconf.h.in
+++ b/include/sysconf.h.in
@@ -214,9 +214,14 @@ int vfprintf(FILE *stream, const char *format, va_list ap);
int vsprintf(char *str, const char *format, va_list ap);
int vsnprintf(char *str, size_t size, const char *format, va_list ap);
+/* Freebsd 5.2.1 actually has u_char those it throws more
+ errors having it defined again - TSL */
+#ifndef HAS_SYS_TYPES_H
typedef unsigned char u_char;
#endif
+#endif
+
typedef int16_t int16;
typedef u_int16_t uint16;
diff --git a/src/bahamut.c b/src/bahamut.c
index a1f91922e..e7cfe222c 100644
--- a/src/bahamut.c
+++ b/src/bahamut.c
@@ -733,7 +733,8 @@ void anope_cmd_part(char *nick, char *chan, const char *fmt, ...)
void anope_cmd_topic(char *whosets, char *chan, char *whosetit,
char *topic, time_t when)
{
- send_cmd(whosets, "TOPIC %s %s %lu :%s", chan, whosetit, when, topic);
+ send_cmd(whosets, "TOPIC %s %s %lu :%s", chan, whosetit,
+ (unsigned long int) when, topic);
}
/* UNSQLINE */
@@ -745,7 +746,7 @@ void anope_cmd_unsqline(char *user)
/* JOIN - SJOIN */
void anope_cmd_join(char *user, char *channel, time_t chantime)
{
- send_cmd(user, "SJOIN %ld %s", chantime, channel);
+ send_cmd(user, "SJOIN %ld %s", (long int) chantime, channel);
}
/* AKILL */
@@ -760,7 +761,7 @@ void anope_cmd_akill(char *user, char *host, char *who, time_t when,
time_t expires, char *reason)
{
send_cmd(NULL, "AKILL %s %s %d %s %ld :%s", host, user, 86400 * 2, who,
- time(NULL), reason);
+ (long int) time(NULL), reason);
}
/* SVSKILL */
@@ -802,8 +803,9 @@ void anope_cmd_svskill(char *source, char *user, const char *fmt, ...)
*/
void anope_cmd_svsmode(User * u, int ac, char **av)
{
- send_cmd(ServerName, "SVSMODE %s %ld %s%s%s", u->nick, u->timestamp,
- av[0], (ac == 2 ? " " : ""), (ac == 2 ? av[1] : ""));
+ send_cmd(ServerName, "SVSMODE %s %ld %s%s%s", u->nick,
+ (long int) u->timestamp, av[0], (ac == 2 ? " " : ""),
+ (ac == 2 ? av[1] : ""));
}
/* SQUIT */
@@ -849,7 +851,7 @@ void anope_cmd_connect(int servernum)
*/
void anope_cmd_svinfo()
{
- send_cmd(NULL, "SVINFO 3 1 0 :%ld", time(NULL));
+ send_cmd(NULL, "SVINFO 3 1 0 :%ld", (long int) time(NULL));
}
/* PASS */
@@ -1296,8 +1298,9 @@ void anope_cmd_211(const char *fmt, ...)
void anope_cmd_nick(char *nick, char *name, char *modes)
{
EnforceQlinedNick(nick, NULL);
- send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s 0 0 :%s", nick, time(NULL),
- modes, ServiceUser, ServiceHost, ServerName, name);
+ send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s 0 0 :%s", nick,
+ (long int) time(NULL), modes, ServiceUser, ServiceHost,
+ ServerName, name);
anope_cmd_sqline(nick, "Reserved for services");
}
@@ -1404,8 +1407,8 @@ void anope_cmd_bot_nick(char *nick, char *user, char *host, char *real,
char *modes)
{
EnforceQlinedNick(nick, s_BotServ);
- send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s 0 0 :%s", nick, time(NULL),
- modes, user, host, ServerName, real);
+ send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s 0 0 :%s", nick,
+ (long int) time(NULL), modes, user, host, ServerName, real);
anope_cmd_sqline(nick, "Reserved for services");
}
@@ -1420,14 +1423,14 @@ void anope_cmd_svsnick(char *source, char *guest, time_t when)
if (!source || !guest) {
return;
}
- send_cmd(NULL, "SVSNICK %s %s :%ld", source, guest, when);
+ send_cmd(NULL, "SVSNICK %s %s :%ld", source, guest, (long int) when);
}
void anope_cmd_guest_nick(char *nick, char *user, char *host, char *real,
char *modes)
{
- send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s 0 0 :%s", nick, time(NULL),
- modes, user, host, ServerName, real);
+ send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s 0 0 :%s", nick,
+ (long int) time(NULL), modes, user, host, ServerName, real);
}
void anope_cmd_svso(char *source, char *nick, char *flag)
@@ -1449,7 +1452,8 @@ void anope_cmd_vhost_off(User * u)
/* sent if svid is something weird */
void anope_cmd_svid_umode(char *nick, time_t ts)
{
- send_cmd(ServerName, "SVSMODE %s %lu +d 1", nick, ts);
+ send_cmd(ServerName, "SVSMODE %s %lu +d 1", nick,
+ (unsigned long int) ts);
}
diff --git a/src/base64.c b/src/base64.c
index e97a2a196..18e010957 100644
--- a/src/base64.c
+++ b/src/base64.c
@@ -290,7 +290,7 @@ char *encode_ip(u_char * ip)
if (!ip)
return "*";
- if (strchr(ip, ':')) {
+ if (strchr((char *) ip, ':')) {
return NULL;
} else {
ia.s_addr = inet_addr(ip);
diff --git a/src/channels.c b/src/channels.c
index cf5f0b12e..dc6290986 100644
--- a/src/channels.c
+++ b/src/channels.c
@@ -1326,7 +1326,7 @@ char *get_limit(Channel * chan)
if (chan->limit == 0)
return NULL;
- snprintf(limit, sizeof(limit), "%lu", chan->limit);
+ snprintf(limit, sizeof(limit), "%lu", (unsigned long int) chan->limit);
return limit;
}
diff --git a/src/chanserv.c b/src/chanserv.c
index 94e704236..da135d748 100644
--- a/src/chanserv.c
+++ b/src/chanserv.c
@@ -2443,7 +2443,8 @@ char *cs_get_limit(ChannelInfo * ci)
if (ci->mlock_limit == 0)
return NULL;
- snprintf(limit, sizeof(limit), "%lu", ci->mlock_limit);
+ snprintf(limit, sizeof(limit), "%lu",
+ (unsigned long int) ci->mlock_limit);
return limit;
}
diff --git a/src/dreamforge.c b/src/dreamforge.c
index 47f48ae1d..062b3373b 100644
--- a/src/dreamforge.c
+++ b/src/dreamforge.c
@@ -526,7 +526,8 @@ void anope_cmd_remove_akill(char *user, char *host)
void anope_cmd_topic(char *whosets, char *chan, char *whosetit,
char *topic, time_t when)
{
- send_cmd(whosets, "TOPIC %s %s %lu :%s", chan, whosetit, when, topic);
+ send_cmd(whosets, "TOPIC %s %s %lu :%s", chan, whosetit,
+ (unsigned long int) when, topic);
}
/* PART */
@@ -1072,8 +1073,9 @@ void anope_cmd_211(const char *fmt, ...)
void anope_cmd_nick(char *nick, char *name, char *modes)
{
EnforceQlinedNick(nick, NULL);
- send_cmd(NULL, "NICK %s 1 %ld %s %s %s 0 :%s", nick, time(NULL),
- ServiceUser, ServiceHost, ServerName, name);
+ send_cmd(NULL, "NICK %s 1 %ld %s %s %s 0 :%s", nick,
+ (long int) time(NULL), ServiceUser, ServiceHost, ServerName,
+ name);
anope_cmd_mode(nick, nick, "%s", modes);
anope_cmd_sqline(nick, "Reserved for services");
}
@@ -1184,8 +1186,8 @@ void anope_cmd_bot_nick(char *nick, char *user, char *host, char *real,
char *modes)
{
EnforceQlinedNick(nick, s_BotServ);
- send_cmd(NULL, "NICK %s 1 %ld %s %s %s 0 :%s", nick, time(NULL),
- user, host, ServerName, real);
+ send_cmd(NULL, "NICK %s 1 %ld %s %s %s 0 :%s", nick,
+ (long int) time(NULL), user, host, ServerName, real);
anope_cmd_mode(nick, "MODE %s %s", nick, modes);
anope_cmd_sqline(nick, "Reserved for services");
}
@@ -1232,14 +1234,14 @@ void anope_cmd_svsnick(char *source, char *guest, time_t when)
if (!source || !guest) {
return;
}
- send_cmd(NULL, "SVSNICK %s %s :%ld", source, guest, when);
+ send_cmd(NULL, "SVSNICK %s %s :%ld", source, guest, (long int) when);
}
void anope_cmd_guest_nick(char *nick, char *user, char *host, char *real,
char *modes)
{
- send_cmd(NULL, "NICK %s 1 %ld %s %s %s 0 :%s", nick, time(NULL),
- user, host, ServerName, real);
+ send_cmd(NULL, "NICK %s 1 %ld %s %s %s 0 :%s", nick,
+ (long int) time(NULL), user, host, ServerName, real);
anope_cmd_mode(nick, "MODE %s %s", nick, modes);
}
diff --git a/src/hybrid.c b/src/hybrid.c
index 554bb97e7..68fad43f7 100644
--- a/src/hybrid.c
+++ b/src/hybrid.c
@@ -709,7 +709,8 @@ void anope_cmd_unsqline(char *user)
void anope_cmd_join(char *user, char *channel, time_t chantime)
{
- send_cmd(NULL, "SJOIN %ld %s + :%s", time(NULL), channel, user);
+ send_cmd(NULL, "SJOIN %ld %s + :%s", (long int) time(NULL), channel,
+ user);
}
/*
@@ -725,7 +726,7 @@ void anope_cmd_akill(char *user, char *host, char *who, time_t when,
time_t expires, char *reason)
{
send_cmd(s_OperServ, "KLINE * %ld %s %s :%s",
- (expires - (long) time(NULL)), user, host, reason);
+ (long int) (expires - (long) time(NULL)), user, host, reason);
}
void anope_cmd_svskill(char *source, char *user, const char *fmt, ...)
@@ -785,7 +786,7 @@ void anope_cmd_svsinfo()
*/
void anope_cmd_svinfo()
{
- send_cmd(NULL, "SVINFO 5 5 0 :%ld", time(NULL));
+ send_cmd(NULL, "SVINFO 5 5 0 :%ld", (long int) time(NULL));
}
/* CAPAB */
@@ -831,8 +832,8 @@ void anope_cmd_bot_nick(char *nick, char *user, char *host, char *real,
char *modes)
{
EnforceQlinedNick(nick, s_BotServ);
- send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s :%s", nick, time(NULL),
- modes, user, host, ServerName, real);
+ send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s :%s", nick,
+ (long int) time(NULL), modes, user, host, ServerName, real);
}
@@ -1215,8 +1216,9 @@ void anope_cmd_mode(char *source, char *dest, const char *fmt, ...)
void anope_cmd_nick(char *nick, char *name, char *mode)
{
EnforceQlinedNick(nick, NULL);
- send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s :%s", nick, time(NULL), mode,
- ServiceUser, ServiceHost, ServerName, (name));
+ send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s :%s", nick,
+ (long int) time(NULL), mode, ServiceUser, ServiceHost,
+ ServerName, (name));
}
void anope_cmd_kick(char *source, char *chan, char *user, const char *fmt,
@@ -1356,8 +1358,8 @@ void anope_cmd_svsnick(char *nick, char *newnick, time_t when)
void anope_cmd_guest_nick(char *nick, char *user, char *host, char *real,
char *modes)
{
- send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s :%s", nick, time(NULL),
- modes, user, host, ServerName, real);
+ send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s :%s", nick,
+ (long int) time(NULL), modes, user, host, ServerName, real);
}
void anope_cmd_svso(char *source, char *nick, char *flag)
diff --git a/src/log.c b/src/log.c
index eb51928f0..fa32dd37f 100644
--- a/src/log.c
+++ b/src/log.c
@@ -139,7 +139,8 @@ void alog(const char *fmt, ...)
gettimeofday(&tv, NULL);
strftime(buf, sizeof(buf) - 1, "[%b %d %H:%M:%S", &tm);
s = buf + strlen(buf);
- s += snprintf(s, sizeof(buf) - (s - buf), ".%06d", tv.tv_usec);
+ s += snprintf(s, sizeof(buf) - (s - buf), ".%06d",
+ (int) tv.tv_usec);
strftime(s, sizeof(buf) - (s - buf) - 1, " %Y] ", &tm);
} else {
#endif
@@ -197,7 +198,8 @@ void log_perror(const char *fmt, ...)
gettimeofday(&tv, NULL);
strftime(buf, sizeof(buf) - 1, "[%b %d %H:%M:%S", &tm);
s = buf + strlen(buf);
- s += snprintf(s, sizeof(buf) - (s - buf), ".%06d", tv.tv_usec);
+ s += snprintf(s, sizeof(buf) - (s - buf), ".%06d",
+ (int) tv.tv_usec);
strftime(s, sizeof(buf) - (s - buf) - 1, " %Y] ", &tm);
} else {
#endif
@@ -244,7 +246,8 @@ void fatal(const char *fmt, ...)
gettimeofday(&tv, NULL);
strftime(buf, sizeof(buf) - 1, "[%b %d %H:%M:%S", &tm);
s = buf + strlen(buf);
- s += snprintf(s, sizeof(buf) - (s - buf), ".%06d", tv.tv_usec);
+ s += snprintf(s, sizeof(buf) - (s - buf), ".%06d",
+ (int) tv.tv_usec);
strftime(s, sizeof(buf) - (s - buf) - 1, " %Y] ", &tm);
} else {
#endif
@@ -287,7 +290,8 @@ void fatal_perror(const char *fmt, ...)
gettimeofday(&tv, NULL);
strftime(buf, sizeof(buf) - 1, "[%b %d %H:%M:%S", &tm);
s = buf + strlen(buf);
- s += snprintf(s, sizeof(buf) - (s - buf), ".%06d", tv.tv_usec);
+ s += snprintf(s, sizeof(buf) - (s - buf), ".%06d",
+ (int) tv.tv_usec);
strftime(s, sizeof(buf) - (s - buf) - 1, " %Y] ", &tm);
} else {
#endif
diff --git a/src/modules.c b/src/modules.c
index 2bab85f1a..787afe894 100644
--- a/src/modules.c
+++ b/src/modules.c
@@ -1402,7 +1402,7 @@ int moduleAddCallback(char *name, time_t when,
}
if (debug)
alog("Added module CallBack: [%s] due to execute at %ld",
- new->name ? new->name : "?", new->when);
+ new->name ? new->name : "?", (long int) new->when);
return MOD_ERR_OK;
}
diff --git a/src/nickserv.c b/src/nickserv.c
index 6c9a5fd45..65ee90489 100644
--- a/src/nickserv.c
+++ b/src/nickserv.c
@@ -1855,7 +1855,7 @@ void add_ns_timeout(NickAlias * na, int type, time_t delay)
timeout_routine = timeout_release;
else {
alog("NickServ: unknown timeout type %d! na=0x%p (%s), delay=%ld",
- type, (void *) na, na->nick, delay);
+ type, (void *) na, na->nick, (long int) delay);
return;
}
@@ -2290,7 +2290,8 @@ static int do_confirm(User * u)
u->lastnickreg = time(NULL);
if (ircd->modeonreg) {
if (ircd->tsonmode) {
- snprintf(tsbuf, sizeof(tsbuf), "%lu", u->timestamp);
+ snprintf(tsbuf, sizeof(tsbuf), "%lu",
+ (unsigned long int) u->timestamp);
common_svsmode(u, ircd->modeonreg, tsbuf);
} else {
common_svsmode(u, ircd->modeonreg, NULL);
@@ -2448,7 +2449,8 @@ static int do_group(User * u)
notice_lang(s_NickServ, u, NICK_GROUP_JOINED, target->nick);
u->lastnickreg = time(NULL);
- snprintf(tsbuf, sizeof(tsbuf), "%lu", u->timestamp);
+ snprintf(tsbuf, sizeof(tsbuf), "%lu",
+ (unsigned long int) u->timestamp);
if (ircd->modeonreg) {
if (ircd->tsonmode) {
common_svsmode(u, ircd->modeonreg, tsbuf);
@@ -2537,7 +2539,8 @@ static int do_identify(User * u)
na->status |= NS_IDENTIFIED;
na->last_seen = time(NULL);
- snprintf(tsbuf, sizeof(tsbuf), "%lu", u->timestamp);
+ snprintf(tsbuf, sizeof(tsbuf), "%lu",
+ (unsigned long int) u->timestamp);
if (ircd->modeonreg) {
if (ircd->tsonmode) {
diff --git a/src/ptlink.c b/src/ptlink.c
index 3bde24c9e..30d9b4576 100644
--- a/src/ptlink.c
+++ b/src/ptlink.c
@@ -621,7 +621,8 @@ void anope_part(char *nick, char *chan)
void anope_topic(char *whosets, char *chan, char *whosetit, char *topic,
time_t when)
{
- send_cmd(whosets, "TOPIC %s %s %lu :%s", chan, whosetit, when, topic);
+ send_cmd(whosets, "TOPIC %s %s %lu :%s", chan, whosetit,
+ (unsigned long int) when, topic);
}
/*
@@ -735,7 +736,7 @@ void anope_cmd_connect(int servernum)
*/
void anope_cmd_svinfo()
{
- send_cmd(NULL, "SVINFO 3 6 %lu", time(NULL));
+ send_cmd(NULL, "SVINFO 3 6 %lu", (unsigned long int) time(NULL));
}
/*
@@ -746,7 +747,8 @@ void anope_cmd_svinfo()
*/
void anope_cmd_svsinfo()
{
- send_cmd(NULL, "SVSINFO %lu %d", time(NULL), maxusercnt);
+ send_cmd(NULL, "SVSINFO %lu %d", (unsigned long int) time(NULL),
+ maxusercnt);
}
/*
@@ -1214,9 +1216,9 @@ void anope_cmd_mode(char *source, char *dest, const char *fmt, ...)
void anope_cmd_nick(char *nick, char *name, char *mode)
{
EnforceQlinedNick(nick, NULL);
- send_cmd(NULL, "NICK %s 1 %lu %s %s %s %s %s :%s", nick, time(NULL),
- mode, ServiceUser, ServiceHost, ServiceHost, ServerName,
- name);
+ send_cmd(NULL, "NICK %s 1 %lu %s %s %s %s %s :%s", nick,
+ (unsigned long int) time(NULL), mode, ServiceUser,
+ ServiceHost, ServiceHost, ServerName, name);
anope_cmd_sqline(nick, "Reserved for services");
}
@@ -1425,8 +1427,9 @@ void anope_cmd_bot_nick(char *nick, char *user, char *host, char *real,
char *modes)
{
EnforceQlinedNick(nick, s_BotServ);
- send_cmd(NULL, "NICK %s 1 %lu %s %s %s %s %s :%s", nick, time(NULL),
- modes, user, host, host, ServerName, real);
+ send_cmd(NULL, "NICK %s 1 %lu %s %s %s %s %s :%s", nick,
+ (unsigned long int) time(NULL), modes, user, host, host,
+ ServerName, real);
anope_cmd_sqline(nick, "Reserved for services");
}
@@ -1505,14 +1508,15 @@ void anope_cmd_svsnick(char *source, char *guest, time_t when)
if (!source || !guest) {
return;
}
- send_cmd(NULL, "SVSNICK %s %s :%ld", source, guest, when);
+ send_cmd(NULL, "SVSNICK %s %s :%ld", source, guest, (long int) when);
}
void anope_cmd_guest_nick(char *nick, char *user, char *host, char *real,
char *modes)
{
- send_cmd(NULL, "NICK %s 1 %lu %s %s %s %s %s :%s", nick, time(NULL),
- modes, user, host, host, ServerName, real);
+ send_cmd(NULL, "NICK %s 1 %lu %s %s %s %s %s :%s", nick,
+ (unsigned long int) time(NULL), modes, user, host, host,
+ ServerName, real);
}
diff --git a/src/rageircd.c b/src/rageircd.c
index 9bc5d3e0b..e3fbf8653 100644
--- a/src/rageircd.c
+++ b/src/rageircd.c
@@ -627,7 +627,8 @@ void anope_cmd_part(char *nick, char *chan, const char *fmt, ...)
void anope_cmd_topic(char *whosets, char *chan, char *whosetit,
char *topic, time_t when)
{
- send_cmd(whosets, "TOPIC %s %s %lu :%s", chan, whosetit, when, topic);
+ send_cmd(whosets, "TOPIC %s %s %lu :%s", chan, whosetit,
+ (unsigned long int) when, topic);
}
void anope_cmd_vhost_off(User * u)
@@ -649,14 +650,14 @@ void anope_cmd_unsqline(char *user)
void anope_cmd_join(char *user, char *channel, time_t chantime)
{
- send_cmd(user, "SJOIN %ld %s", chantime, channel);
+ send_cmd(user, "SJOIN %ld %s", (long int) chantime, channel);
}
void anope_cmd_akill(char *user, char *host, char *who, time_t when,
time_t expires, char *reason)
{
send_cmd(NULL, "AKILL %s %s %d %s %ld :%s", host, user, 86400 * 2, who,
- time(NULL), reason);
+ (long int) time(NULL), reason);
}
void anope_cmd_svskill(char *source, char *user, const char *fmt, ...)
@@ -683,8 +684,9 @@ void anope_cmd_svskill(char *source, char *user, const char *fmt, ...)
void anope_cmd_svsmode(User * u, int ac, char **av)
{
- send_cmd(ServerName, "SVSMODE %s %ld %s%s%s", u->nick, u->timestamp,
- av[0], (ac == 2 ? " " : ""), (ac == 2 ? av[1] : ""));
+ send_cmd(ServerName, "SVSMODE %s %ld %s%s%s", u->nick,
+ (long int) u->timestamp, av[0], (ac == 2 ? " " : ""),
+ (ac == 2 ? av[1] : ""));
}
void anope_cmd_squit(char *servname, char *message)
@@ -717,7 +719,7 @@ void anope_cmd_connect(int servernum)
void anope_cmd_svinfo()
{
- send_cmd(NULL, "SVINFO 5 5 0 %ld bluemoon 0", time(NULL));
+ send_cmd(NULL, "SVINFO 5 5 0 %ld bluemoon 0", (long int) time(NULL));
}
void anope_cmd_capab()
@@ -1198,8 +1200,8 @@ void anope_cmd_nick(char *nick, char *name, char *modes)
{
EnforceQlinedNick(nick, NULL);
send_cmd(NULL, "SNICK %s %ld 1 %s %s 0 * %s 0 %s :%s", nick,
- time(NULL), ServiceUser, ServiceHost, ServerName, modes,
- name);
+ (long int) time(NULL), ServiceUser, ServiceHost, ServerName,
+ modes, name);
anope_cmd_sqline(nick, "Reserved for services");
}
@@ -1273,7 +1275,7 @@ void anope_cmd_bot_nick(char *nick, char *user, char *host, char *real,
{
EnforceQlinedNick(nick, s_BotServ);
send_cmd(NULL, "SNICK %s %ld 1 %s %s 0 * %s 0 %s :%s", nick,
- time(NULL), user, host, ServerName, modes, real);
+ (long int) time(NULL), user, host, ServerName, modes, real);
anope_cmd_sqline(nick, "Reserved for services");
}
@@ -1427,14 +1429,14 @@ void anope_cmd_svsnick(char *source, char *guest, time_t when)
if (!source || !guest) {
return;
}
- send_cmd(NULL, "SVSNICK %s %s :%ld", source, guest, when);
+ send_cmd(NULL, "SVSNICK %s %s :%ld", source, guest, (long int) when);
}
void anope_cmd_guest_nick(char *nick, char *user, char *host, char *real,
char *modes)
{
send_cmd(NULL, "SNICK %s %ld 1 %s %s 0 * %s 0 %s :%s", nick,
- time(NULL), user, host, ServerName, modes, real);
+ (long int) time(NULL), user, host, ServerName, modes, real);
}
@@ -1448,7 +1450,8 @@ void anope_cmd_svso(char *source, char *nick, char *flag)
/* sent if svid is something weird */
void anope_cmd_svid_umode(char *nick, time_t ts)
{
- send_cmd(ServerName, "SVSMODE %s %lu +d 1", nick, ts);
+ send_cmd(ServerName, "SVSMODE %s %lu +d 1", nick,
+ (unsigned long int) ts);
}
/* SVSMODE +d */
diff --git a/src/timeout.c b/src/timeout.c
index 16963d7d3..f71e16cac 100644
--- a/src/timeout.c
+++ b/src/timeout.c
@@ -51,7 +51,7 @@ void check_timeouts(void)
time_t t = time(NULL);
if (debug >= 2)
- alog("debug: Checking timeouts at %ld", t);
+ alog("debug: Checking timeouts at %ld", (long int) t);
to = timeouts;
while (to) {
diff --git a/src/ultimate2.c b/src/ultimate2.c
index 1eced99d4..10324ee6b 100644
--- a/src/ultimate2.c
+++ b/src/ultimate2.c
@@ -781,7 +781,8 @@ void anope_cmd_remove_akill(char *user, char *host)
void anope_cmd_topic(char *whosets, char *chan, char *whosetit,
char *topic, time_t when)
{
- send_cmd(whosets, "TOPIC %s %s %lu :%s", chan, whosetit, when, topic);
+ send_cmd(whosets, "TOPIC %s %s %lu :%s", chan, whosetit,
+ (unsigned long int) when, topic);
}
void anope_cmd_vhost_off(User * u)
@@ -1180,7 +1181,7 @@ void anope_cmd_svsnick(char *source, char *guest, time_t when)
if (!source || !guest) {
return;
}
- send_cmd(NULL, "SVSNICK %s %s :%ld", source, guest, when);
+ send_cmd(NULL, "SVSNICK %s %s :%ld", source, guest, (long int) when);
}
/* Events */
@@ -1418,8 +1419,9 @@ void anope_cmd_serv_privmsg(char *source, char *dest, char *msg)
void anope_cmd_nick(char *nick, char *name, char *mode)
{
EnforceQlinedNick(nick, NULL);
- send_cmd(NULL, "NICK %s 1 %ld %s %s %s 0 :%s", nick, time(NULL),
- ServiceUser, ServiceHost, ServerName, name);
+ send_cmd(NULL, "NICK %s 1 %ld %s %s %s 0 :%s", nick,
+ (long int) time(NULL), ServiceUser, ServiceHost, ServerName,
+ name);
anope_cmd_mode(nick, nick, "%s", mode);
anope_cmd_sqline(nick, "Reserved for services");
}
@@ -1473,8 +1475,8 @@ void anope_cmd_bot_nick(char *nick, char *user, char *host, char *real,
char *modes)
{
EnforceQlinedNick(nick, s_BotServ);
- send_cmd(NULL, "NICK %s 1 %ld %s %s %s 0 :%s", nick, time(NULL),
- user, host, ServerName, real);
+ send_cmd(NULL, "NICK %s 1 %ld %s %s %s 0 :%s", nick,
+ (long int) time(NULL), user, host, ServerName, real);
anope_cmd_mode(nick, nick, "%s", modes);
anope_cmd_sqline(nick, "Reserved for services");
}
@@ -1545,8 +1547,8 @@ void anope_cmd_sgline(char *mask, char *reason)
void anope_cmd_guest_nick(char *nick, char *user, char *host, char *real,
char *modes)
{
- send_cmd(NULL, "NICK %s 1 %ld %s %s %s 0 :%s", nick, time(NULL),
- user, host, ServerName, real);
+ send_cmd(NULL, "NICK %s 1 %ld %s %s %s 0 :%s", nick,
+ (long int) time(NULL), user, host, ServerName, real);
anope_cmd_mode(nick, "MODE %s %s", nick, modes);
}
diff --git a/src/ultimate3.c b/src/ultimate3.c
index 2f3dea307..c6cb5ad11 100644
--- a/src/ultimate3.c
+++ b/src/ultimate3.c
@@ -698,14 +698,14 @@ void anope_cmd_vhost_on(char *nick, char *vIdent, char *vhost)
void anope_cmd_join(char *user, char *channel, time_t chantime)
{
- send_cmd(user, "SJOIN %ld %s", chantime, channel);
+ send_cmd(user, "SJOIN %ld %s", (long int) chantime, channel);
}
void anope_cmd_akill(char *user, char *host, char *who, time_t when,
time_t expires, char *reason)
{
send_cmd(NULL, "AKILL %s %s %d %s %ld :%s", host, user, 86400 * 2, who,
- time(NULL), reason);
+ (long int) time(NULL), reason);
}
void anope_cmd_svskill(char *source, char *user, const char *fmt, ...)
@@ -729,8 +729,9 @@ void anope_cmd_svskill(char *source, char *user, const char *fmt, ...)
void anope_cmd_svsmode(User * u, int ac, char **av)
{
- send_cmd(ServerName, "SVSMODE %s %ld %s%s%s", u->nick, u->timestamp,
- av[0], (ac == 2 ? " " : ""), (ac == 2 ? av[1] : ""));
+ send_cmd(ServerName, "SVSMODE %s %ld %s%s%s", u->nick,
+ (long int) u->timestamp, av[0], (ac == 2 ? " " : ""),
+ (ac == 2 ? av[1] : ""));
}
void anope_squit(char *servname, char *message)
@@ -1000,7 +1001,8 @@ int anope_event_whois(char *source, int ac, char **av)
void anope_cmd_topic(char *whosets, char *chan, char *whosetit,
char *topic, time_t when)
{
- send_cmd(whosets, "TOPIC %s %s %lu :%s", chan, whosetit, when, topic);
+ send_cmd(whosets, "TOPIC %s %s %lu :%s", chan, whosetit,
+ (unsigned long int) when, topic);
}
void anope_cmd_372(char *source, char *msg)
@@ -1029,8 +1031,8 @@ void anope_cmd_nick(char *nick, char *name, char *modes)
{
EnforceQlinedNick(nick, NULL);
send_cmd(NULL, "CLIENT %s 1 %ld %s + %s %s * %s 0 0 :%s", nick,
- time(NULL), modes, ServiceUser, ServiceHost, ServerName,
- name);
+ (long int) time(NULL), modes, ServiceUser, ServiceHost,
+ ServerName, name);
anope_cmd_sqline(nick, "Reserved for services");
}
@@ -1038,7 +1040,7 @@ void anope_cmd_guest_nick(char *nick, char *user, char *host, char *real,
char *modes)
{
send_cmd(NULL, "CLIENT %s 1 %ld %s + %s %s * %s 0 0 :%s", nick,
- time(NULL), modes, user, host, ServerName, real);
+ (long int) time(NULL), modes, user, host, ServerName, real);
}
void anope_cmd_mode(char *source, char *dest, const char *fmt, ...)
@@ -1064,7 +1066,7 @@ void anope_cmd_bot_nick(char *nick, char *user, char *host, char *real,
{
EnforceQlinedNick(nick, s_BotServ);
send_cmd(NULL, "CLIENT %s 1 %ld %s + %s %s * %s 0 0 :%s", nick,
- time(NULL), modes, user, host, ServerName, real);
+ (long int) time(NULL), modes, user, host, ServerName, real);
anope_cmd_sqline(nick, "Reserved for services");
}
@@ -1539,7 +1541,7 @@ void anope_cmd_svsnick(char *source, char *guest, time_t when)
if (!source || !guest) {
return;
}
- send_cmd(NULL, "SVSNICK %s %s :%ld", source, guest, when);
+ send_cmd(NULL, "SVSNICK %s %s :%ld", source, guest, (long int) when);
}
/* Functions that use serval cmd functions */
@@ -1581,7 +1583,8 @@ void anope_cmd_release_svshold(char *nick)
/* sent if svid is something weird */
void anope_cmd_svid_umode(char *nick, time_t ts)
{
- send_cmd(ServerName, "SVSMODE %s %lu +d 1", nick, ts);
+ send_cmd(ServerName, "SVSMODE %s %lu +d 1", nick,
+ (unsigned long int) ts);
}
/* SVSMODE +d */
@@ -1594,7 +1597,7 @@ void anope_cmd_nc_change(User * u)
/* SVSMODE +d */
void anope_cmd_svid_umode2(User * u, char *ts)
{
- // not used by bahamut ircds
+ /* not used by bahamut ircds */
}
void anope_cmd_svid_umode3(User * u, char *ts)
@@ -1623,7 +1626,7 @@ int anope_event_svinfo(char *source, int ac, char **av)
*/
void anope_cmd_svinfo()
{
- send_cmd(NULL, "SVINFO 5 3 0 :%ld", time(NULL));
+ send_cmd(NULL, "SVINFO 5 3 0 :%ld", (long int) time(NULL));
}
int anope_event_pass(char *source, int ac, char **av)
diff --git a/src/unreal31.c b/src/unreal31.c
index 263ec5039..ebe476a6d 100644
--- a/src/unreal31.c
+++ b/src/unreal31.c
@@ -497,7 +497,8 @@ void anope_cmd_remove_akill(char *user, char *host)
void anope_cmd_topic(char *whosets, char *chan, char *whosetit,
char *topic, time_t when)
{
- send_cmd(whosets, "TOPIC %s %s %lu :%s", chan, whosetit, when, topic);
+ send_cmd(whosets, "TOPIC %s %s %lu :%s", chan, whosetit,
+ (unsigned long int) when, topic);
}
void anope_cmd_vhost_off(User * u)
@@ -510,7 +511,7 @@ void anope_cmd_akill(char *user, char *host, char *who, time_t when,
time_t expires, char *reason)
{
send_cmd(NULL, "TKL + G %s %s %s %ld %ld :%s", user, host, who,
- time(NULL) + 86400 * 2, when, reason);
+ (long int) time(NULL) + 86400 * 2, (long int) when, reason);
}
void anope_cmd_svskill(char *source, char *user, const char *fmt, ...)
@@ -571,16 +572,17 @@ void anope_cmd_376(char *source)
void anope_cmd_nick(char *nick, char *name, char *modes)
{
EnforceQlinedNick(nick, NULL);
- send_cmd(NULL, "NICK %s 1 %ld %s %s %s 0 %s * :%s", nick, time(NULL),
- ServiceUser, ServiceHost, ServerName, modes, name);
+ send_cmd(NULL, "NICK %s 1 %ld %s %s %s 0 %s * :%s", nick,
+ (long int) time(NULL), ServiceUser, ServiceHost, ServerName,
+ modes, name);
anope_cmd_sqline(nick, "Reserved for services");
}
void anope_cmd_guest_nick(char *nick, char *user, char *host, char *real,
char *modes)
{
- send_cmd(NULL, "NICK %s 1 %ld %s %s %s 0 %s * :%s", nick, time(NULL),
- user, host, ServerName, modes, real);
+ send_cmd(NULL, "NICK %s 1 %ld %s %s %s 0 %s * :%s", nick,
+ (long int) time(NULL), user, host, ServerName, modes, real);
}
void anope_cmd_mode(char *source, char *dest, const char *fmt, ...)
@@ -605,8 +607,8 @@ void anope_cmd_bot_nick(char *nick, char *user, char *host, char *real,
char *modes)
{
EnforceQlinedNick(nick, s_BotServ);
- send_cmd(NULL, "NICK %s 1 %ld %s %s %s 0 %s * :%s", nick, time(NULL),
- user, host, ServerName, modes, real);
+ send_cmd(NULL, "NICK %s 1 %ld %s %s %s 0 %s * :%s", nick,
+ (long int) time(NULL), user, host, ServerName, modes, real);
anope_cmd_sqline(nick, "Reserved for services");
}
@@ -1100,7 +1102,7 @@ void anope_cmd_svsnick(char *source, char *guest, time_t when)
if (!source || !guest) {
return;
}
- send_cmd(NULL, "SVSNICK %s %s :%ld", source, guest, when);
+ send_cmd(NULL, "SVSNICK %s %s :%ld", source, guest, (long int) when);
}
/* Functions that use serval cmd functions */
diff --git a/src/unreal32.c b/src/unreal32.c
index 43cb2bb14..439313ff6 100644
--- a/src/unreal32.c
+++ b/src/unreal32.c
@@ -738,7 +738,7 @@ void anope_cmd_topic(char *whosets, char *chan, char *whosetit,
char *topic, time_t when)
{
send_cmd(whosets, "%s %s %s %lu :%s", send_token("TOPIC", ")"), chan,
- whosetit, when, topic);
+ whosetit, (unsigned long int) when, topic);
}
void anope_cmd_vhost_off(User * u)
@@ -757,7 +757,8 @@ void anope_cmd_akill(char *user, char *host, char *who, time_t when,
time_t expires, char *reason)
{
send_cmd(NULL, "%s + G %s %s %s %ld %ld :%s", send_token("TKL", "BD"),
- user, host, who, time(NULL) + 86400 * 2, when, reason);
+ user, host, who, (long int) time(NULL) + 86400 * 2,
+ (long int) when, reason);
}
/*
@@ -839,8 +840,8 @@ void anope_cmd_nick(char *nick, char *name, char *modes)
{
EnforceQlinedNick(nick, NULL);
send_cmd(NULL, "%s %s 1 %ld %s %s %s 0 %s * :%s",
- send_token("NICK", "&"), nick, time(NULL), ServiceUser,
- ServiceHost, ServerName, modes, name);
+ send_token("NICK", "&"), nick, (long int) time(NULL),
+ ServiceUser, ServiceHost, ServerName, modes, name);
anope_cmd_sqline(nick, "Reserved for services");
}
@@ -848,8 +849,8 @@ void anope_cmd_guest_nick(char *nick, char *user, char *host, char *real,
char *modes)
{
send_cmd(NULL, "%s %s 1 %ld %s %s %s 0 %s * :%s",
- send_token("NICK", "&"), nick, time(NULL), user, host,
- ServerName, modes, real);
+ send_token("NICK", "&"), nick, (long int) time(NULL), user,
+ host, ServerName, modes, real);
}
void anope_cmd_mode(char *source, char *dest, const char *fmt, ...)
@@ -875,8 +876,8 @@ void anope_cmd_bot_nick(char *nick, char *user, char *host, char *real,
{
EnforceQlinedNick(nick, s_BotServ);
send_cmd(NULL, "%s %s 1 %ld %s %s %s 0 %s * :%s",
- send_token("NICK", "&"), nick, time(NULL), user, host,
- ServerName, modes, real);
+ send_token("NICK", "&"), nick, (long int) time(NULL), user,
+ host, ServerName, modes, real);
anope_cmd_sqline(nick, "Reserved for services");
}
@@ -1436,7 +1437,7 @@ void anope_cmd_svsnick(char *source, char *guest, time_t when)
return;
}
send_cmd(NULL, "%s %s %s :%ld", send_token("SVSNICK", "e"), source,
- guest, when);
+ guest, (long int) when);
}
/* Functions that use serval cmd functions */
diff --git a/src/users.c b/src/users.c
index 7248d22ec..2f102eef0 100644
--- a/src/users.c
+++ b/src/users.c
@@ -612,7 +612,8 @@ User *do_nick(const char *source, char *nick, char *username, char *host,
sprintf(user->na->last_usermask, "%s@%s",
common_get_vident(user), common_get_vhost(user));
- snprintf(tsbuf, sizeof(tsbuf), "%lu", user->timestamp);
+ snprintf(tsbuf, sizeof(tsbuf), "%lu",
+ (unsigned long int) user->timestamp);
anope_cmd_svid_umode2(user, tsbuf);
alog("%s: %s!%s@%s automatically identified for nick %s",
@@ -625,7 +626,8 @@ User *do_nick(const char *source, char *nick, char *username, char *host,
if (ircd->check_nick_id) {
if (nick_identified(user)) {
char tsbuf[16];
- snprintf(tsbuf, sizeof(tsbuf), "%lu", user->timestamp);
+ snprintf(tsbuf, sizeof(tsbuf), "%lu",
+ (unsigned long int) user->timestamp);
anope_cmd_svid_umode3(user, tsbuf);
}
}
diff --git a/src/viagra.c b/src/viagra.c
index 92cd0f073..d204f9d8a 100644
--- a/src/viagra.c
+++ b/src/viagra.c
@@ -776,7 +776,8 @@ void anope_cmd_part(char *nick, char *chan, const char *fmt, ...)
void anope_cmd_topic(char *whosets, char *chan, char *whosetit,
char *topic, time_t when)
{
- send_cmd(whosets, "TOPIC %s %s %lu :%s", chan, whosetit, when, topic);
+ send_cmd(whosets, "TOPIC %s %s %lu :%s", chan, whosetit,
+ (unsigned long int) when, topic);
}
void anope_cmd_vhost_off(User * u)
@@ -801,7 +802,7 @@ void anope_cmd_unsqline(char *user)
void anope_cmd_join(char *user, char *channel, time_t chantime)
{
- send_cmd(user, "SJOIN %ld %s", chantime, channel);
+ send_cmd(user, "SJOIN %ld %s", (long int) chantime, channel);
}
@@ -818,7 +819,7 @@ void anope_cmd_akill(char *user, char *host, char *who, time_t when,
time_t expires, char *reason)
{
send_cmd(NULL, "AKILL %s %s %d %s %ld :%s", host, user, 86400 * 2, who,
- time(NULL), reason);
+ (long int) time(NULL), reason);
}
@@ -917,8 +918,9 @@ int anope_event_ping(char *source, int ac, char **av)
void anope_cmd_svsmode(User * u, int ac, char **av)
{
- send_cmd(ServerName, "SVSMODE %s %ld %s%s%s", u->nick, u->timestamp,
- av[0], (ac == 2 ? " " : ""), (ac == 2 ? av[1] : ""));
+ send_cmd(ServerName, "SVSMODE %s %ld %s%s%s", u->nick,
+ (long int) u->timestamp, av[0], (ac == 2 ? " " : ""),
+ (ac == 2 ? av[1] : ""));
}
void anope_cmd_squit(char *servname, char *message)
@@ -957,7 +959,7 @@ void anope_cmd_connect(int servernum)
*/
void anope_cmd_svinfo()
{
- send_cmd(NULL, "SVINFO 5 3 0 :%ld", time(NULL));
+ send_cmd(NULL, "SVINFO 5 3 0 :%ld", (long int) time(NULL));
}
/* CAPAB */
@@ -1443,8 +1445,8 @@ void anope_cmd_bot_nick(char *nick, char *user, char *host, char *real,
char *modes)
{
EnforceQlinedNick(nick, s_BotServ);
- send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s 0 0 :%s", nick, time(NULL),
- modes, user, host, ServerName, real);
+ send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s 0 0 :%s", nick,
+ (long int) time(NULL), modes, user, host, ServerName, real);
anope_cmd_sqline(nick, "Reserved for services");
}
@@ -1471,8 +1473,9 @@ void anope_cmd_kick(char *source, char *chan, char *user, const char *fmt,
void anope_cmd_nick(char *nick, char *name, char *modes)
{
EnforceQlinedNick(nick, NULL);
- send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s 0 0 :%s", nick, time(NULL),
- modes, ServiceUser, ServiceHost, ServerName, name);
+ send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s 0 0 :%s", nick,
+ (long int) time(NULL), modes, ServiceUser, ServiceHost,
+ ServerName, name);
anope_cmd_sqline(nick, "Reserved for services");
}
@@ -1537,14 +1540,14 @@ void anope_cmd_svsnick(char *source, char *guest, time_t when)
if (!source || !guest) {
return;
}
- send_cmd(NULL, "SVSNICK %s %s :%ld", source, guest, when);
+ send_cmd(NULL, "SVSNICK %s %s :%ld", source, guest, (long int) when);
}
void anope_cmd_guest_nick(char *nick, char *user, char *host, char *real,
char *modes)
{
- send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s 0 0 :%s", nick, time(NULL),
- modes, user, host, ServerName, real);
+ send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s 0 0 :%s", nick,
+ (long int) time(NULL), modes, user, host, ServerName, real);
}
void anope_cmd_svso(char *source, char *nick, char *flag)
@@ -1562,7 +1565,8 @@ void anope_cmd_unban(char *name, char *nick)
/* sent if svid is something weird */
void anope_cmd_svid_umode(char *nick, time_t ts)
{
- send_cmd(ServerName, "SVSMODE %s %lu +d 1", nick, ts);
+ send_cmd(ServerName, "SVSMODE %s %lu +d 1", nick,
+ (unsigned long int) ts);
}
/* SVSMODE +d */
diff --git a/version.log b/version.log
index a667bf7d8..badc9fcc3 100644
--- a/version.log
+++ b/version.log
@@ -8,10 +8,14 @@
VERSION_MAJOR="1"
VERSION_MINOR="7"
VERSION_PATCH="5"
-VERSION_BUILD="421"
+VERSION_BUILD="423"
# $Log$
#
+# BUILD : 1.7.5 (423)
+# BUGS : N/A
+# NOTES : code tidy up fixes stuff under Freebsd
+#
# BUILD : 1.7.5 (421)
# BUGS : 198
# NOTES : 1. fixes TSMODE warnings found by SGR, 2. Fixed OPNOTICE when doing /CS OP
generated by cgit (git 2.34.1) at 2025-06-20 17:56:37 +0000