summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/core/bs_info.c2
-rw-r--r--src/events.c8
-rw-r--r--src/helpserv.c2
-rw-r--r--src/hostserv.c25
-rw-r--r--src/memoserv.c6
-rw-r--r--src/news.c2
-rw-r--r--src/nickserv.c2
-rw-r--r--src/operserv.c5
8 files changed, 25 insertions, 27 deletions
diff --git a/src/core/bs_info.c b/src/core/bs_info.c
index 2c90dba9d..ce802db3c 100644
--- a/src/core/bs_info.c
+++ b/src/core/bs_info.c
@@ -262,7 +262,7 @@ void send_bot_channels(User * u, BotInfo * bi)
}
if (*buf)
- notice_user(s_BotServ, u, buf);
+ notice_user(s_BotServ, u, "%s", buf);
return;
}
diff --git a/src/events.c b/src/events.c
index 17c9903cc..9971da58c 100644
--- a/src/events.c
+++ b/src/events.c
@@ -512,12 +512,12 @@ int Module::AddEventHook(EvtHook *evh)
return status;
}
-int Module::DelEventHandler(const char *name)
+int Module::DelEventHandler(const char *sname)
{
EvtMessage *evm;
int status;
- evm = findEventHandler(EVENT, name);
+ evm = findEventHandler(EVENT, sname);
if (!evm) {
return MOD_ERR_NOEXIST;
}
@@ -529,12 +529,12 @@ int Module::DelEventHandler(const char *name)
return status;
}
-int Module::DelEventHook(const char *name)
+int Module::DelEventHook(const char *sname)
{
EvtHook *evh;
int status;
- evh = findEventHook(EVENTHOOKS, name);
+ evh = findEventHook(EVENTHOOKS, sname);
if (!evh) {
return MOD_ERR_NOEXIST;
}
diff --git a/src/helpserv.c b/src/helpserv.c
index 36074f3b9..72f2142c7 100644
--- a/src/helpserv.c
+++ b/src/helpserv.c
@@ -50,7 +50,7 @@ void helpserv_init(void)
*/
void helpserv(User * u, char *buf)
{
- char *cmd, *s;
+ const char *cmd, *s;
cmd = strtok(buf, " ");
diff --git a/src/hostserv.c b/src/hostserv.c
index b7074bc83..36cd99fdc 100644
--- a/src/hostserv.c
+++ b/src/hostserv.c
@@ -46,7 +46,6 @@ void moduleAddHostServCmds(void)
void get_hostserv_stats(long *nrec, long *memuse)
{
long count = 0, mem = 0;
- int i;
HostCore *hc;
for (hc = head; hc; hc = hc->next) {
@@ -89,7 +88,7 @@ void hostserv_init(void)
*/
void hostserv(User * u, char *buf)
{
- char *cmd, *s;
+ const char *cmd, *s;
cmd = strtok(buf, " ");
@@ -177,12 +176,12 @@ HostCore *createHostCorelist(HostCore * next, char *nick, char *vIdent,
* @param found If found
* @return HostCore
*/
-HostCore *findHostCore(HostCore * head, char *nick, bool* found)
+HostCore *findHostCore(HostCore * phead, char *nick, bool* found)
{
HostCore *previous, *current;
*found = false;
- current = head;
+ current = phead;
previous = current;
if (!nick) {
@@ -201,7 +200,7 @@ HostCore *findHostCore(HostCore * head, char *nick, bool* found)
current = current->next;
}
}
- if (current == head) {
+ if (current == phead) {
return NULL;
} else {
return previous;
@@ -209,7 +208,7 @@ HostCore *findHostCore(HostCore * head, char *nick, bool* found)
}
/*************************************************************************/
-HostCore *insertHostCore(HostCore * head, HostCore * prev, char *nick,
+HostCore *insertHostCore(HostCore * phead, HostCore * prev, char *nick,
char *vIdent, char *vHost, const char *creator,
int32 tmp_time)
{
@@ -252,8 +251,8 @@ HostCore *insertHostCore(HostCore * head, HostCore * prev, char *nick,
}
newCore->time = tmp_time;
if (prev == NULL) {
- tmp = head;
- head = newCore;
+ tmp = phead;
+ phead = newCore;
newCore->next = tmp;
} else {
tmp = prev->next;
@@ -261,18 +260,18 @@ HostCore *insertHostCore(HostCore * head, HostCore * prev, char *nick,
newCore->next = tmp;
}
}
- return head;
+ return phead;
}
/*************************************************************************/
-HostCore *deleteHostCore(HostCore * head, HostCore * prev)
+HostCore *deleteHostCore(HostCore * phead, HostCore * prev)
{
HostCore *tmp;
if (prev == NULL) {
- tmp = head;
- head = head->next;
+ tmp = phead;
+ phead = phead->next;
} else {
tmp = prev->next;
prev->next = tmp->next;
@@ -284,7 +283,7 @@ HostCore *deleteHostCore(HostCore * head, HostCore * prev)
free(tmp->vIdent);
}
free(tmp);
- return head;
+ return phead;
}
/*************************************************************************/
diff --git a/src/memoserv.c b/src/memoserv.c
index 901e002eb..716bd41e0 100644
--- a/src/memoserv.c
+++ b/src/memoserv.c
@@ -54,7 +54,7 @@ void ms_init(void)
*/
void memoserv(User * u, char *buf)
{
- char *cmd, *s;
+ const char *cmd, *s;
cmd = strtok(buf, " ");
if (!cmd) {
@@ -380,7 +380,7 @@ static void new_memo_mail(NickCore * nc, Memo * m)
fprintf(mail->pipe, getstring2(NULL, MEMO_MAIL_TEXT2), m->sender,
m->number);
fprintf(mail->pipe, "\n\n");
- fprintf(mail->pipe, getstring2(NULL, MEMO_MAIL_TEXT3));
+ fprintf(mail->pipe, "%s", getstring2(NULL, MEMO_MAIL_TEXT3));
fprintf(mail->pipe, "\n\n");
fprintf(mail->pipe, "%s", m->text);
fprintf(mail->pipe, "\n");
@@ -423,7 +423,7 @@ void rsend_notify(User * u, Memo * m, const char *chan)
sprintf(text, fmt, chan);
} else {
fmt = getstring(na, MEMO_RSEND_NICK_MEMO_TEXT);
- sprintf(text, fmt);
+ sprintf(text, "%s", fmt);
}
/* Send notification */
diff --git a/src/news.c b/src/news.c
index 0d0cc2518..a0c2010ba 100644
--- a/src/news.c
+++ b/src/news.c
@@ -330,7 +330,7 @@ int do_randomnews(User * u)
void do_news(User * u, short type)
{
int is_servadmin = is_services_admin(u);
- char *cmd = strtok(NULL, " ");
+ const char *cmd = strtok(NULL, " ");
const char *type_name;
int *msgs;
diff --git a/src/nickserv.c b/src/nickserv.c
index a127bc0c4..2940538b2 100644
--- a/src/nickserv.c
+++ b/src/nickserv.c
@@ -134,7 +134,7 @@ void ns_init(void)
void nickserv(User * u, char *buf)
{
- char *cmd, *s;
+ const char *cmd, *s;
cmd = strtok(buf, " ");
diff --git a/src/operserv.c b/src/operserv.c
index a974b39dd..a32ca46e3 100644
--- a/src/operserv.c
+++ b/src/operserv.c
@@ -116,8 +116,8 @@ void os_init(void)
void operserv(User * u, char *buf)
{
- char *cmd;
- char *s;
+ const char *cmd;
+ const char *s;
alog("%s: %s: %s", s_OperServ, u->nick, buf);
@@ -308,7 +308,6 @@ void load_os_dbase(void)
}
if (ver >= 7) {
- uint32 tmp32;
SAFE(read_int32(&maxusercnt, f));
SAFE(read_int32(&tmp32, f));
maxusertime = tmp32;
generated by cgit (git 2.34.1) at 2025-06-18 16:15:54 +0000