summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam- <Adam-@5417fbe8-f217-4b02-8779-1006273d7864>2009-12-05 21:04:15 +0000
committerAdam- <Adam-@5417fbe8-f217-4b02-8779-1006273d7864>2009-12-05 21:04:15 +0000
commit42b8cfe404d7a00de14ecd00a5f6f58fc4fc00af (patch)
tree9dc1033792f0df868df71b988d5029e3b6159cfc
parent935c1974e80ab2b64d1281a33d2f0663e37ac42c (diff)
Got rid of some now unnecessary code in config.c and moved Config.Opers.clear() to InitOpers where it belongs
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2689 5417fbe8-f217-4b02-8779-1006273d7864
-rw-r--r--src/config.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/src/config.c b/src/config.c
index e7e821f0a..549e19594 100644
--- a/src/config.c
+++ b/src/config.c
@@ -461,6 +461,8 @@ static bool InitOpers(ServerConfig *, const char *, bool)
for (i = 0; i < 1024; ++i)
for (nc = nclists[i]; nc; nc = nc->next)
nc->ot = NULL;
+
+ Config.Opers.clear();
return true;
}
@@ -1528,17 +1530,6 @@ int read_config(int reload)
int retval = 1;
char *s;
int defconCount = 0;
- std::list<std::pair<std::string, std::string> >::iterator it;
-
- /* Clear current opers for reload */
- for (it = Config.Opers.begin(); it != Config.Opers.end(); ++it)
- {
- std::string nick = it->first;
- NickCore *nc = findcore(nick.c_str());
- if (nc)
- nc->ot = NULL;
- }
- Config.Opers.clear();
retval = Config.Read(reload ? false : true);
if (!retval) return 0; // Temporary until most of the below is modified to use the new parser -- CyberBotX