pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-07-05 06:33:13 +02:00
Code Activity

Reorganise some more of this, now makes more logical sense, and almost compiles (just some constification left).

Browse Source 
NOTE: moduleCopyFile() is now local to modules.c (static), but that should not be an issue for any well-written client code.


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1573 5417fbe8-f217-4b02-8779-1006273d7864
This commit is contained in:
Robin Burchell w00t@inspircd.org
2008-11-07 23:56:09 +00:00
parent 95774907e1
commit ba73678ade
1 changed files with 39 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules.c
+39 -37
View File
@@ -444,7 +444,7 @@ int encryptionModuleLoaded()
* @param output the destination to copy the module to
* @return MOD_ERR_OK on success
*/
int moduleCopyFile(char *name, char *output)
static int moduleCopyFile(const char *name, char *output)
{
int ch;
FILE *source, *target;
@@ -513,7 +513,7 @@ int loadModule(const std::string &modname, User * u)
if (modname.empty())
return MOD_ERR_PARAMS;
if ((m = findModule(modname.c_str())) != NULL)
if (findModule(modname.c_str()) != NULL)
return MOD_ERR_EXISTS;
alog("trying to load [%s]", modname.c_str());
@@ -563,51 +563,53 @@ int loadModule(const std::string &modname, User * u)
return MOD_ERR_NOLOAD;
}
if (func)
if (!func)
{
mod_current_module_name = m->name.c_str();
throw CoreException("Couldn't find constructor, yet moderror wasn't set?");
}
/* Create module.
* XXX: we need to handle ModuleException throws here.
*/
std::string nick;
if (u)
nick = u->nick;
else
nick = "";
mod_current_module_name = modname.c_str();
Module *m = func(nick);
mod_current_module = m;
mod_current_user = u;
m->filename = sstrdup(buf);
m->handle = handle;
/* Create module.
* XXX: we need to handle ModuleException throws here.
*/
std::string nick;
if (u)
nick = u->nick;
else
nick = "";
Module *m = func(nick);
mod_current_module = m;
mod_current_user = u;
m->filename = sstrdup(buf);
m->handle = handle;
/*
if (ret == MOD_STOP) {
alog("%s requested unload...", m->name);
unloadModule(m, NULL);
mod_current_module_name = NULL;
return MOD_ERR_NOLOAD;
}
if (ret == MOD_STOP) {
alog("%s requested unload...", m->name);
unloadModule(m, NULL);
mod_current_module_name = NULL;
return MOD_ERR_NOLOAD;
}
*/
if (m->type == PROTOCOL && protocolModuleLoaded())
{
alog("You cannot load two protocol modules");
ret = MOD_STOP;
}
else if (m->type == ENCRYPTION && encryptionModuleLoaded())
{
alog("You cannot load two encryption modules");
ret = MOD_STOP;
}
mod_current_module_name = NULL;
if (m->type == PROTOCOL && protocolModuleLoaded())
{
alog("You cannot load two protocol modules");
ret = MOD_STOP;
}
else if (m->type == ENCRYPTION && encryptionModuleLoaded())
{
alog("You cannot load two encryption modules");
ret = MOD_STOP;
}
mod_current_module_name = NULL;
if (u)
{
ircdproto->SendGlobops(s_OperServ, "%s loaded module %s", u->nick, m->name.c_str());
notice_lang(s_OperServ, u, OPER_MODULE_LOADED, m->name.c_str());
ircdproto->SendGlobops(s_OperServ, "%s loaded module %s", u->nick, modname.c_str());
notice_lang(s_OperServ, u, OPER_MODULE_LOADED, modname.c_str());
}
addModule(m);
return MOD_ERR_OK;