Merge pull request #1257 from staticfox/tweaks

Small misc cleanups
This commit is contained in:
Alexey Sokolov
2016-04-01 00:00:41 +01:00
2 changed files with 7 additions and 3 deletions
+4
View File
@@ -20,12 +20,16 @@ Makefile
# modperl and modpython generated code
/modules/modperl/functions.cpp
/modules/modperl/modperl_biglib.cpp
/modules/modperl/perlfunctions.cpp
/modules/modperl/ZNC.cpp
/modules/modperl/ZNC.pm
/modules/modperl/swigperlrun.h
/modules/modpython/_znc_core.cpp
/modules/modpython/compiler
/modules/modpython/functions.cpp
/modules/modpython/modpython_biglib.cpp
/modules/modpython/pyfunctions.cpp
/modules/modpython/swigpyrun.h
/modules/modpython/znc_core.py
*.pyc
+3 -3
View File
@@ -557,8 +557,8 @@ bool CTemplate::Print(const CString& sFileName, ostream& oOut) {
}
VCString vsArgs;
sArgs.QuoteSplit(vsArgs);
CString sEnglish, sEnglishes, sContext;
int idx = 0;
CString sEnglish, sContext;
size_type idx = 0;
if (bHaveContext && vsArgs.size() > idx) {
sContext = vsArgs[idx];
idx++;
@@ -586,7 +586,7 @@ bool CTemplate::Print(const CString& sFileName, ostream& oOut) {
sI18N, sContext, sEnglish);
}
MCString msParams;
for (int i = 0; i + idx < vsArgs.size(); ++i) {
for (size_type i = 0; i + idx < vsArgs.size(); ++i) {
msParams[CString(i + 1)] =
GetValue(vsArgs[i + idx], false);
}