summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/datafiles.c2
-rw-r--r--src/init.c2
-rw-r--r--src/misc.c3
-rw-r--r--src/modulemanager.cpp2
-rw-r--r--src/modules.c3
-rw-r--r--src/modules/cs_enforce.c6
-rw-r--r--src/operserv.c3
-rw-r--r--src/protocol/inspircd11.c20
-rw-r--r--src/protocol/inspircd12.cpp18
-rw-r--r--src/sessions.c2
-rw-r--r--src/sockutil.c4
11 files changed, 33 insertions, 32 deletions
diff --git a/src/datafiles.c b/src/datafiles.c
index 5c6d3f606..d7aaef736 100644
--- a/src/datafiles.c
+++ b/src/datafiles.c
@@ -186,7 +186,7 @@ static dbFILE *open_db_write(const char *service, const char *filename,
#ifdef _WIN32
if (debug) {
if (errno == ENOENT) {
- alog("debug: Error %d (ENOENT) : the file or directory does not exist", errno, filename);
+ alog("debug: Error %d (ENOENT) : the file or directory does not exist", errno);
} else if (errno == EACCES) {
alog("debug: Error %d (EACCES) : error while attempting to access file", errno);
} else {
diff --git a/src/init.c b/src/init.c
index 28e2dade3..499bede64 100644
--- a/src/init.c
+++ b/src/init.c
@@ -387,8 +387,10 @@ int init_primary(int ac, char **av)
int init_secondary(int ac, char **av)
{
+#ifndef _WIN32
int i;
int started_from_term = isatty(0) && isatty(1) && isatty(2);
+#endif
/* Add Core MSG handles */
moduleAddMsgs();
diff --git a/src/misc.c b/src/misc.c
index 5e6f4a4b8..75ed59a30 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -951,9 +951,8 @@ static void arc4_addrandom(void *dat, int datlen)
*/
void rand_init()
{
- int n;
#ifndef _WIN32
- int fd;
+ int n, fd;
#endif
struct {
#ifdef USE_MYSQL
diff --git a/src/modulemanager.cpp b/src/modulemanager.cpp
index cfbcc9794..672af7bbc 100644
--- a/src/modulemanager.cpp
+++ b/src/modulemanager.cpp
@@ -38,7 +38,9 @@ static int moduleCopyFile(const char *name, const char *output)
{
int ch;
FILE *source, *target;
+#ifndef _WIN32
int srcfp;
+#endif
char input[4096];
int len;
diff --git a/src/modules.c b/src/modules.c
index 0d7bd199b..48a01c43a 100644
--- a/src/modules.c
+++ b/src/modules.c
@@ -1233,7 +1233,6 @@ void ModuleRunTimeDirCleanUp()
BOOL fFinished;
HANDLE hList;
TCHAR szDir[MAX_PATH + 1];
- TCHAR szSubDir[MAX_PATH + 1];
WIN32_FIND_DATA FileData;
char buffer[_MAX_PATH];
#endif
@@ -1294,7 +1293,7 @@ void ModuleRunTimeDirCleanUp()
}
} else {
if (debug) {
- alog("debug: Invalid File Handle. GetLastError reports %d\n", GetLastError());
+ alog("debug: Invalid File Handle. GetLastError reports %d\n", static_cast<int>(GetLastError()));
}
}
FindClose(hList);
diff --git a/src/modules/cs_enforce.c b/src/modules/cs_enforce.c
index aa5b6be42..e20f3ee91 100644
--- a/src/modules/cs_enforce.c
+++ b/src/modules/cs_enforce.c
@@ -363,7 +363,7 @@ void do_enforce_cmode_R(Channel * c)
if (!nick_identified(u)) {
get_idealban(ci, u, mask, sizeof(mask));
reason = getstring(u->na, CHAN_NOT_ALLOWED_TO_JOIN);
- if (((cbm = &cbmodes['R'])->flag == 0)
+ if (((cbm = &cbmodes[static_cast<int>('R')])->flag == 0)
|| !(c->mode & cbm->flag))
ircdproto->SendMode(whosends(ci), ci->name, "+b %s %lu", mask,
time(NULL));
@@ -395,7 +395,7 @@ void do_enforce_modes(Channel * c)
{
CBMode *cbm;
- if (((cbm = &cbmodes['R'])->flag != 0) && (c->mode & cbm->flag))
+ if (((cbm = &cbmodes[static_cast<int>('R')])->flag != 0) && (c->mode & cbm->flag))
do_enforce_cmode_R(c);
}
@@ -462,7 +462,7 @@ int my_cs_help_enforce(User * u)
ircdproto->SendMessage(findbot(s_ChanServ), u->nick, " ");
me->NoticeLang(s_ChanServ, u, LNG_CHAN_HELP_ENFORCE);
ircdproto->SendMessage(findbot(s_ChanServ), u->nick, " ");
- if (cbmodes['R'].flag != 0)
+ if (cbmodes[static_cast<int>('R')].flag != 0)
me->NoticeLang(s_ChanServ, u, LNG_CHAN_HELP_ENFORCE_R_ENABLED);
else
me->NoticeLang(s_ChanServ, u, LNG_CHAN_HELP_ENFORCE_R_DISABLED);
diff --git a/src/operserv.c b/src/operserv.c
index 2fcf4b139..54f0988a6 100644
--- a/src/operserv.c
+++ b/src/operserv.c
@@ -153,9 +153,8 @@ void load_os_dbase()
{
dbFILE *f;
int16 i, ver;
- uint16 tmp16, n;
+ uint16 tmp16;
uint32 tmp32;
- char *s;
int failed = 0;
if (!(f = open_db(s_OperServ, OperDBName, "r", OPER_VERSION)))
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index 14c6254a8..1b38286d5 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -499,7 +499,7 @@ class InspIRCdProto : public IRCDProto
void SendVhostDel(User *u)
{
- inspircd_cmd_chghost(u->nick, (u->mode & umodes['x']) ? u->chost.c_str() : u->host);
+ inspircd_cmd_chghost(u->nick, (u->mode & umodes[static_cast<int>('x')]) ? u->chost.c_str() : u->host);
}
void SendAkill(const char *user, const char *host, const char *who, time_t when, time_t expires, const char *reason)
@@ -629,7 +629,7 @@ class InspIRCdProto : public IRCDProto
/* SVSHOLD - set */
void SendSVSHold(const char *nick)
{
- send_cmd(s_OperServ, "SVSHOLD %s %ds :%s", nick, NSReleaseTimeout, "Being held for registered user");
+ send_cmd(s_OperServ, "SVSHOLD %s %ds :%s", nick, static_cast<int>(NSReleaseTimeout), "Being held for registered user");
}
/* SVSHOLD - release */
@@ -1231,10 +1231,10 @@ int anope_event_capab(const char *source, int ac, const char **av)
cbmi->getvalue = get_flood;
cbmi->csgetvalue = cs_get_flood;
- myCbmodes['f'].flag = CMODE_f;
- myCbmodes['f'].flags = 0;
- myCbmodes['f'].setvalue = set_flood;
- myCbmodes['f'].cssetvalue = cs_set_flood;
+ myCbmodes[static_cast<int>('f')].flag = CMODE_f;
+ myCbmodes[static_cast<int>('f')].flags = 0;
+ myCbmodes[static_cast<int>('f')].setvalue = set_flood;
+ myCbmodes[static_cast<int>('f')].cssetvalue = cs_set_flood;
pmodule_ircd_cbmodeinfos(myCbmodeinfos);
pmodule_ircd_cbmodes(myCbmodes);
@@ -1249,13 +1249,13 @@ int anope_event_capab(const char *source, int ac, const char **av)
}
}
if (has_banexceptionmod) {
- myCmmodes['e'].addmask = add_exception;
- myCmmodes['e'].delmask = del_exception;
+ myCmmodes[static_cast<int>('e')].addmask = add_exception;
+ myCmmodes[static_cast<int>('e')].delmask = del_exception;
ircd->except = 1;
}
if (has_inviteexceptionmod) {
- myCmmodes['I'].addmask = add_invite;
- myCmmodes['I'].delmask = del_invite;
+ myCmmodes[static_cast<int>('I')].addmask = add_invite;
+ myCmmodes[static_cast<int>('I')].delmask = del_invite;
ircd->invitemode = 1;
}
ircd->svshold = has_svsholdmod;
diff --git a/src/protocol/inspircd12.cpp b/src/protocol/inspircd12.cpp
index d21b5691c..e02ece0f3 100644
--- a/src/protocol/inspircd12.cpp
+++ b/src/protocol/inspircd12.cpp
@@ -498,7 +498,7 @@ class InspIRCdProto : public IRCDProto
void SendVhostDel(User *u)
{
- inspircd_cmd_chghost(u->uid, (u->mode & umodes['x']) ? u->chost.c_str() : u->host);
+ inspircd_cmd_chghost(u->uid, (u->mode & umodes[static_cast<int>('x')]) ? u->chost.c_str() : u->host);
}
void SendAkill(const char *user, const char *host, const char *who, time_t when, time_t expires, const char *reason)
@@ -1251,10 +1251,10 @@ int anope_event_capab(const char *source, int ac, const char **av)
cbmi->getvalue = get_flood;
cbmi->csgetvalue = cs_get_flood;
- myCbmodes['f'].flag = CMODE_f;
- myCbmodes['f'].flags = 0;
- myCbmodes['f'].setvalue = set_flood;
- myCbmodes['f'].cssetvalue = cs_set_flood;
+ myCbmodes[static_cast<int>('f')].flag = CMODE_f;
+ myCbmodes[static_cast<int>('f')].flags = 0;
+ myCbmodes[static_cast<int>('f')].setvalue = set_flood;
+ myCbmodes[static_cast<int>('f')].cssetvalue = cs_set_flood;
pmodule_ircd_cbmodeinfos(myCbmodeinfos);
pmodule_ircd_cbmodes(myCbmodes);
@@ -1269,13 +1269,13 @@ int anope_event_capab(const char *source, int ac, const char **av)
}
}
if (has_banexceptionmod) {
- myCmmodes['e'].addmask = add_exception;
- myCmmodes['e'].delmask = del_exception;
+ myCmmodes[static_cast<int>('e')].addmask = add_exception;
+ myCmmodes[static_cast<int>('e')].delmask = del_exception;
ircd->except = 1;
}
if (has_inviteexceptionmod) {
- myCmmodes['I'].addmask = add_invite;
- myCmmodes['I'].delmask = del_invite;
+ myCmmodes[static_cast<int>('I')].addmask = add_invite;
+ myCmmodes[static_cast<int>('I')].delmask = del_invite;
ircd->invitemode = 1;
}
ircd->svshold = has_svsholdmod;
diff --git a/src/sessions.c b/src/sessions.c
index f598d616d..69863382a 100644
--- a/src/sessions.c
+++ b/src/sessions.c
@@ -465,7 +465,7 @@ void save_exceptions()
SAFE(write_int16(nexceptions, f));
for (i = 0; i < nexceptions; i++) {
SAFE(write_string(exceptions[i].mask, f));
- SAFE(write_int16(exceptions[i].limit, f));
+ SAFE(write_int16(static_cast<uint16>(exceptions[i].limit), f));
SAFE(write_buffer(exceptions[i].who, f));
SAFE(write_string(exceptions[i].reason, f));
SAFE(write_int32(exceptions[i].time, f));
diff --git a/src/sockutil.c b/src/sockutil.c
index 772b4aacc..683ffbef9 100644
--- a/src/sockutil.c
+++ b/src/sockutil.c
@@ -431,7 +431,7 @@ char *sgets(char *buf, int len, ano_socket_t s)
if (read_buffer_len() == 0 && c == 0)
return reinterpret_cast<char *>(-1);
c = sgetc(s);
- while (--len && (*ptr++ = c) != '\n' && (c = sgetc(s)) >= 0);
+ while (--len && (*ptr++ = static_cast<char>(c)) != '\n' && (c = sgetc(s)) >= 0);
if (c < 0)
return NULL;
*ptr = 0;
@@ -532,7 +532,7 @@ static char *pack_ip(const char *ipaddr)
for (i = 0; i < 4; i++) {
if (tmp[i] < 0 || tmp[i] > 255)
return NULL;
- ipbuf[i] = tmp[i];
+ ipbuf[i] = static_cast<char>(tmp[i]);
}
return ipbuf;
}
generated by cgit (git 2.34.1) at 2025-07-03 23:16:38 +0000