diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/channels.c | 2 | ||||
| -rw-r--r-- | src/modules.c | 46 | ||||
| -rw-r--r-- | src/process.c | 2 | ||||
| -rw-r--r-- | src/timeout.c | 4 |
4 files changed, 24 insertions, 30 deletions
diff --git a/src/channels.c b/src/channels.c index 758af8448..b49eebf5b 100644 --- a/src/channels.c +++ b/src/channels.c @@ -166,7 +166,7 @@ void chan_set_modes(const char *source, Channel * chan, int ac, const char **av, CUMode *cum; unsigned char botmode = 0; BotInfo *bi; - User *u, *user; + User *user; int i, real_ac = ac; const char **real_av = av; diff --git a/src/modules.c b/src/modules.c index 6ea04120b..6359c7c01 100644 --- a/src/modules.c +++ b/src/modules.c @@ -657,7 +657,7 @@ int destroyMessage(Message * m) * Module Callback Functions *******************************************************************************/ -int Module::AddCallback(const char *name, time_t when, +int Module::AddCallback(const char *nname, time_t when, int (*func) (int argc, char *argv[]), int argc, char **argv) { @@ -667,8 +667,8 @@ int Module::AddCallback(const char *name, time_t when, if (!newcb) return MOD_ERR_MEMORY; - if (name) - newcb->name = sstrdup(name); + if (nname) + newcb->name = sstrdup(nname); else newcb->name = NULL; newcb->when = when; @@ -761,22 +761,20 @@ static ModuleCallBack *moduleCallBackFindEntry(const char *mod_name, bool * foun } } -void Module::DelCallback(const char *name) +void Module::DelCallback(const char *nname) { ModuleCallBack *current = NULL; ModuleCallBack *prev = NULL, *tmp = NULL; int del = 0; - if (!name) { - return; - } + current = moduleCallBackHead; + while (current) { if ((current->owner_name) && (current->name)) { if ((strcmp(this->name.c_str(), current->owner_name) == 0) - && (strcmp(current->name, name) == 0)) { + && (strcmp(current->name, nname) == 0)) { if (debug) { - alog("debug: removing CallBack %s for module %s", name, - this->name.c_str()); + alog("debug: removing CallBack %s for module %s", nname, this->name.c_str()); } tmp = current->next; /* get a pointer to the next record, as once we delete this record, we'll lose it :) */ moduleCallBackDeleteEntry(prev); /* delete this record */ @@ -1056,22 +1054,22 @@ void Module::NoticeLang(char *source, User * u, int number, ...) va_list va; char buffer[4096], outbuf[4096]; char *fmt = NULL; - int lang = NSDefLanguage; + int mlang = NSDefLanguage; char *s, *t, *buf; /* Find the users lang, and use it if we can */ if (u && u->na && u->na->nc) { - lang = u->na->nc->language; + mlang = u->na->nc->language; } /* If the users lang isnt supported, drop back to English */ - if (this->lang[lang].argc == 0) { - lang = LANG_EN_US; + if (this->lang[mlang].argc == 0) { + mlang = LANG_EN_US; } /* If the requested lang string exists for the language */ - if (this->lang[lang].argc > number) { - fmt = this->lang[lang].argv[number]; + if (this->lang[mlang].argc > number) { + fmt = this->lang[mlang].argv[number]; buf = sstrdup(fmt); va_start(va, number); @@ -1088,31 +1086,31 @@ void Module::NoticeLang(char *source, User * u, int number, ...) } delete [] buf; } else { - alog("%s: INVALID language string call, language: [%d], String [%d]", this->name.c_str(), lang, number); + alog("%s: INVALID language string call, language: [%d], String [%d]", this->name.c_str(), mlang, number); } } const char *Module::GetLangString(User * u, int number) { - int lang = NSDefLanguage; + int mlang = NSDefLanguage; /* Find the users lang, and use it if we can */ if (u && u->na && u->na->nc) - lang = u->na->nc->language; + mlang = u->na->nc->language; /* If the users lang isnt supported, drop back to English */ - if (this->lang[lang].argc == 0) - lang = LANG_EN_US; + if (this->lang[mlang].argc == 0) + mlang = LANG_EN_US; /* If the requested lang string exists for the language */ - if (this->lang[lang].argc > number) { - return this->lang[lang].argv[number]; + if (this->lang[mlang].argc > number) { + return this->lang[mlang].argv[number]; /* Return an empty string otherwise, because we might be used without * the return value being checked. If we would return NULL, bad things * would happen! */ } else { - alog("%s: INVALID language string call, language: [%d], String [%d]", this->name.c_str(), lang, number); + alog("%s: INVALID language string call, language: [%d], String [%d]", this->name.c_str(), mlang, number); return ""; } } diff --git a/src/process.c b/src/process.c index 638f1d683..0590513e8 100644 --- a/src/process.c +++ b/src/process.c @@ -262,7 +262,7 @@ int split_buf(char *buf, const char ***argv, int colon_special) } if (*buf == ':') { (*argv)[argc++] = buf + 1; - buf = ""; + buf = (char *)""; // XXX: unsafe cast. } else { s = strpbrk(buf, " "); if (s) { diff --git a/src/timeout.c b/src/timeout.c index 28223c9a9..d7544fb9e 100644 --- a/src/timeout.c +++ b/src/timeout.c @@ -37,10 +37,6 @@ void check_timeouts() to = to->next; continue; } - if (debug >= 4) { - alog("debug: Running timeout 0x%p (code=0x%p repeat=%d)", - static_cast<void *>(to), reinterpret_cast<voidF>(to->code), to->repeat); - } to->code(to); if (to->repeat) { to = to->next; |