aboutsummaryrefslogtreecommitdiff
path: root/src/modules.cpp
diff options
context:
space:
mode:
authorGravatar Sadie Powell2021-07-01 12:33:51 +0100
committerGravatar Sadie Powell2021-07-01 12:33:51 +0100
commitd95d7fc4f574b4ce3593b6684dd9fd738c40fcab (patch)
tree88bc789896945fac5b82bc19dd4b8e440e590da6 /src/modules.cpp
parentRequire that hideserver is set to a valid hostname. (diff)
parentAllow reloading SSL profiles on rehash. (diff)
Merge branch 'insp3' into master.
Diffstat (limited to 'src/modules.cpp')
-rw-r--r--src/modules.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/modules.cpp b/src/modules.cpp
index 3651c2ad6..40fad434d 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -52,7 +52,6 @@ Module::Module(int mprops, const std::string& mdesc)
{
}
-// These declarations define the behavours of the base class Module (which does nothing at all)
Cullable::Result Module::Cull()
{
if (ModuleDLLManager)
@@ -317,17 +316,17 @@ swap_now:
if (prioritizationState == PRIO_STATE_LAST)
prioritizationState = PRIO_STATE_AGAIN;
/* Suggestion from Phoenix, "shuffle" the modules to better retain call order */
- int incrmnt = 1;
+ int increment = 1;
if (my_pos > swap_pos)
- incrmnt = -1;
+ increment = -1;
- for (size_t j = my_pos; j != swap_pos; j += incrmnt)
+ for (size_t j = my_pos; j != swap_pos; j += increment)
{
- if ((j + incrmnt > EventHandlers[i].size() - 1) || ((incrmnt == -1) && (j == 0)))
+ if ((j + increment > EventHandlers[i].size() - 1) || ((increment == -1) && (j == 0)))
continue;
- std::swap(EventHandlers[i][j], EventHandlers[i][j+incrmnt]);
+ std::swap(EventHandlers[i][j], EventHandlers[i][j+increment]);
}
}
@@ -448,7 +447,7 @@ void ModuleManager::UnloadAll()
{
/* We do this more than once, so that any service providers get a
* chance to be unhooked by the modules using them, but then get
- * a chance to be removed themsleves.
+ * a chance to be removed themselves.
*
* Note: this deliberately does NOT delete the DLLManager objects
*/