From 53d2078f6f49be89fbb9f76751d75d6dae85fc7a Mon Sep 17 00:00:00 2001 From: Jackmcbarn Date: Wed, 1 Dec 2010 16:36:48 -0500 Subject: Don't use a typedef as a variable name --- src/modules/m_spanningtree/fjoin.cpp | 8 ++++---- src/modules/m_spanningtree/fmode.cpp | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src/modules') diff --git a/src/modules/m_spanningtree/fjoin.cpp b/src/modules/m_spanningtree/fjoin.cpp index 3a64ff75f..d79cd37ce 100644 --- a/src/modules/m_spanningtree/fjoin.cpp +++ b/src/modules/m_spanningtree/fjoin.cpp @@ -110,18 +110,18 @@ CmdResult CommandFJoin::Handle(const std::vector& params, User *src if (apply_other_sides_modes && !incremental) { unsigned int idx = 2; - std::vector modelist; + std::vector mode_list; // Mode parser needs to know what channel to act on. - modelist.push_back(params[0]); + mode_list.push_back(params[0]); /* Remember, params[params.size() - 1] is nicklist, and we don't want to apply *that* */ for (idx = 2; idx != (params.size() - 1); idx++) { - modelist.push_back(params[idx]); + mode_list.push_back(params[idx]); } - ServerInstance->SendMode(modelist, srcuser); + ServerInstance->SendMode(mode_list, srcuser); } /* Now, process every 'modes,nick' pair */ diff --git a/src/modules/m_spanningtree/fmode.cpp b/src/modules/m_spanningtree/fmode.cpp index a851ccda0..5695deb6a 100644 --- a/src/modules/m_spanningtree/fmode.cpp +++ b/src/modules/m_spanningtree/fmode.cpp @@ -30,16 +30,16 @@ CmdResult CommandFMode::Handle(const std::vector& params, User *who const_cast(params)[2][0] = '='; } - std::vector modelist; - modelist.push_back(params[0]); + std::vector mode_list; + mode_list.push_back(params[0]); time_t TS = atoi(params[1].c_str()); if (!TS) return CMD_INVALID; - modelist.insert(modelist.end(), params.begin() + 2, params.end()); + mode_list.insert(mode_list.end(), params.begin() + 2, params.end()); Extensible* target; irc::modestacker modes; - ServerInstance->Modes->Parse(modelist, who, target, modes); + ServerInstance->Modes->Parse(mode_list, who, target, modes); // maybe last user already parted the channel; discard if so. if (!target) @@ -57,7 +57,7 @@ CmdResult CommandFMode::Handle(const std::vector& params, User *who return CMD_FAILURE; // netburst merge: only if equal, and new in 2.1, only if using = - bool merge = (TS == ourTS && modelist[1][0] == '='); + bool merge = (TS == ourTS && mode_list[1][0] == '='); ServerInstance->Modes->Process(who, target, modes, merge); ServerInstance->Modes->Send(who, target, modes); -- cgit v1.3.1-10-gc9f91