From 22e58205fce63a0b26916992406a91d941a45791 Mon Sep 17 00:00:00 2001 From: staticfox Date: Thu, 31 Mar 2016 10:20:04 -0400 Subject: [PATCH 1/3] template: Don't re-declare sEnglishes --- src/Template.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Template.cpp b/src/Template.cpp index ab5fe042..bdb369c5 100644 --- a/src/Template.cpp +++ b/src/Template.cpp @@ -557,7 +557,7 @@ bool CTemplate::Print(const CString& sFileName, ostream& oOut) { } VCString vsArgs; sArgs.QuoteSplit(vsArgs); - CString sEnglish, sEnglishes, sContext; + CString sEnglish, sContext; int idx = 0; if (bHaveContext && vsArgs.size() > idx) { sContext = vsArgs[idx]; From 8526721c52e8ab66ccfe399a129cbbb6b6f51807 Mon Sep 17 00:00:00 2001 From: staticfox Date: Thu, 31 Mar 2016 10:30:41 -0400 Subject: [PATCH 2/3] gitignore: Ignore code made by swig and codegen.pl --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index b1e38f0a..0197e6aa 100644 --- a/.gitignore +++ b/.gitignore @@ -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 From 249e43047d7c5e6be685fb5063aaec04d194eea2 Mon Sep 17 00:00:00 2001 From: staticfox Date: Thu, 31 Mar 2016 10:32:57 -0400 Subject: [PATCH 3/3] template: Iterate over size_type --- src/Template.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Template.cpp b/src/Template.cpp index bdb369c5..6d7fdec0 100644 --- a/src/Template.cpp +++ b/src/Template.cpp @@ -558,7 +558,7 @@ bool CTemplate::Print(const CString& sFileName, ostream& oOut) { VCString vsArgs; sArgs.QuoteSplit(vsArgs); CString sEnglish, sContext; - int idx = 0; + 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); }