summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorgeniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b <geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>2004-12-30 14:25:56 +0000
committergeniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b <geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>2004-12-30 14:25:56 +0000
commit1fe375c972626f84408eb8c0044f2bfb07956e65 (patch)
tree571d879f4b4d9466f0953e938cb772e9672e10fa /src
parent428c78c62ac67189af5b8dcba1b31cff9bba9b20 (diff)
BUILD : 1.7.6 (511) BUGS : NOTES : Rollback to 507
git-svn-id: svn://svn.anope.org/anope/trunk@511 31f1291d-b8d6-0310-a050-a5561fc1590b git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@365 5417fbe8-f217-4b02-8779-1006273d7864
Diffstat (limited to 'src')
-rw-r--r--src/commands.c23
-rw-r--r--src/modules.c4
2 files changed, 2 insertions, 25 deletions
diff --git a/src/commands.c b/src/commands.c
index cf9509497..e37eb574b 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -69,29 +69,6 @@ void mod_run_cmd(char *service, User * u, CommandHash * cmdTable[],
const char *cmd)
{
Command *c = findCommand(cmdTable, cmd);
-
- if (c) {
- if (cmdTable == HOSTSERV) {
- c->mod_name = NULL;
- } else if (cmdTable == BOTSERV) {
- c->mod_name = NULL;
- } else if (cmdTable == MEMOSERV) {
- c->mod_name = NULL;
- } else if (cmdTable == CHANSERV) {
- c->mod_name = NULL;
- } else if (cmdTable == NICKSERV) {
- c->mod_name = NULL;
- } else if (cmdTable == HELPSERV) {
- c->mod_name = NULL;
- } else if (cmdTable == OPERSERV) {
- c->mod_name = NULL;
- } else {
- c->mod_name = sstrdup(mod_current_module_name);
- if (debug)
- alog("Module %s is using addCommand instead of moduleAddCommand.", c->mod_name);
- }
- }
-
do_run_cmd(service, u, c, cmd);
}
diff --git a/src/modules.c b/src/modules.c
index eace42ae7..107cf0bfa 100644
--- a/src/modules.c
+++ b/src/modules.c
@@ -1887,6 +1887,7 @@ void moduleDelData(ModuleData **md, char *key)
if(key) {
while(current) {
+ next = current->next;
if((stricmp(current->moduleName,mod_name)==0) && (stricmp(current->key,key)==0)) {
if(prev) {
prev->next = current->next;
@@ -1900,7 +1901,6 @@ void moduleDelData(ModuleData **md, char *key)
free(current);
}
prev = current;
- next = current->next;
current = next;
}
}
@@ -1921,6 +1921,7 @@ void moduleDelAllData(ModuleData **md)
ModuleData *next = NULL;
while(current) {
+ next = current->next;
if((stricmp(current->moduleName,mod_name)==0)) {
if(prev) {
prev->next = current->next;
@@ -1934,7 +1935,6 @@ void moduleDelAllData(ModuleData **md)
free(current);
}
prev = current;
- next = current->next;
current = next;
}
free(mod_name);