[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [6476] Repair defects detected by gcc-4.9.2
From: |
Greg Chicares |
Subject: |
[lmi-commits] [6476] Repair defects detected by gcc-4.9.2 |
Date: |
Mon, 18 Jan 2016 15:21:21 +0000 |
Revision: 6476
http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=6476
Author: chicares
Date: 2016-01-18 15:21:20 +0000 (Mon, 18 Jan 2016)
Log Message:
-----------
Repair defects detected by gcc-4.9.2
Modified Paths:
--------------
lmi/trunk/ChangeLog
lmi/trunk/cgicc-3.1.4.md5sums
lmi/trunk/cgicc-3.1.4.patch
Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2016-01-18 04:19:29 UTC (rev 6475)
+++ lmi/trunk/ChangeLog 2016-01-18 15:21:20 UTC (rev 6476)
@@ -38469,3 +38469,9 @@
workhorse.make
Fix defect introduced 20160118T0304Z: sh quoting.
+20160118T1521Z <address@hidden> [455]
+
+ cgicc-3.1.4.md5sums
+ cgicc-3.1.4.patch
+Repair defects detected by gcc-4.9.2 .
+
Modified: lmi/trunk/cgicc-3.1.4.md5sums
===================================================================
--- lmi/trunk/cgicc-3.1.4.md5sums 2016-01-18 04:19:29 UTC (rev 6475)
+++ lmi/trunk/cgicc-3.1.4.md5sums 2016-01-18 15:21:20 UTC (rev 6476)
@@ -12,10 +12,10 @@
1dae375bc0784e2e488c2618fdc61ef6 *include/cgicc/MStreamable.h
40b971901c9128c1fba50516d0f7f93d *src/cgicc/CgiEnvironment.cpp
d4b9bc750124e5ec763fbfe19cc7ebd9 *src/cgicc/CgiUtils.cpp
-0dc93bcbabefb0d0609ed360478fd149 *src/cgicc/Cgicc.cpp
+36dad1abec35c6cc94d70af00934a44a *src/cgicc/Cgicc.cpp
29a3f059727c5c2e30560c002e5510f5 *src/cgicc/FormEntry.cpp
931388cbf6a0adaff7e55f60f3f018c7 *src/cgicc/FormFile.cpp
e2f842172d2b5f8fbb84d4ffeab07fb1 *src/cgicc/HTMLAttributes.cpp
-2f12fef455ef77e59c4297757d5aef9c *src/cgicc/HTMLElements.cpp
+f2c5776d5e1036cfd8d10f9334840e1f *src/cgicc/HTMLElements.cpp
dac2f35cd6eccc1bf0a89401ab7f9a34 *src/cgicc/HTTPHeaders.cpp
113e154b1160dec9fc1b014531196c4c *src/cgicc/MStreamable.cpp
Modified: lmi/trunk/cgicc-3.1.4.patch
===================================================================
--- lmi/trunk/cgicc-3.1.4.patch 2016-01-18 04:19:29 UTC (rev 6475)
+++ lmi/trunk/cgicc-3.1.4.patch 2016-01-18 15:21:20 UTC (rev 6476)
@@ -1,6 +1,6 @@
-diff --recursive --unified=3 original/cgicc-3.1.4/cgicc/CgiDefs.h
modified/cgicc-3.1.4/cgicc/CgiDefs.h
+diff --recursive '--unified=3' original/cgicc-3.1.4/cgicc/CgiDefs.h
modified/cgicc-3.1.4/cgicc/CgiDefs.h
--- original/cgicc-3.1.4/cgicc/CgiDefs.h 2000-10-15 16:03:07.000000000
+0000
-+++ modified/cgicc-3.1.4/cgicc/CgiDefs.h 2007-11-01 12:35:06.000000000
+0000
++++ modified/cgicc-3.1.4/cgicc/CgiDefs.h 2016-01-18 13:59:21.281250000
+0000
@@ -23,8 +23,11 @@
#define _CGIDEFS_H_ 1
@@ -45,9 +45,9 @@
#endif /* CGICC_USE_NAMESPACES */
#endif /* ! _CGIDEFS_H_ */
-diff --recursive --unified=3 original/cgicc-3.1.4/cgicc/CgiEnvironment.cpp
modified/cgicc-3.1.4/cgicc/CgiEnvironment.cpp
+diff --recursive '--unified=3' original/cgicc-3.1.4/cgicc/CgiEnvironment.cpp
modified/cgicc-3.1.4/cgicc/CgiEnvironment.cpp
--- original/cgicc-3.1.4/cgicc/CgiEnvironment.cpp 2000-10-15
15:58:12.000000000 +0000
-+++ modified/cgicc-3.1.4/cgicc/CgiEnvironment.cpp 2007-07-31
16:32:36.000000000 +0000
++++ modified/cgicc-3.1.4/cgicc/CgiEnvironment.cpp 2016-01-18
13:59:21.312500000 +0000
@@ -40,14 +40,20 @@
CGICCNS CgiEnvironment::CgiEnvironment()
{
@@ -81,9 +81,9 @@
delete [] temp;
throw STDNS runtime_error("I/O error");
}
-diff --recursive --unified=3 original/cgicc-3.1.4/cgicc/CgiUtils.cpp
modified/cgicc-3.1.4/cgicc/CgiUtils.cpp
+diff --recursive '--unified=3' original/cgicc-3.1.4/cgicc/CgiUtils.cpp
modified/cgicc-3.1.4/cgicc/CgiUtils.cpp
--- original/cgicc-3.1.4/cgicc/CgiUtils.cpp 1999-08-09 18:25:31.000000000
+0000
-+++ modified/cgicc-3.1.4/cgicc/CgiUtils.cpp 2007-11-01 11:05:05.265310900
+0000
++++ modified/cgicc-3.1.4/cgicc/CgiUtils.cpp 2016-01-18 13:59:21.312500000
+0000
@@ -183,7 +183,7 @@
//auto_ptr<char> temp = new char[dataSize];
char *temp = new char[dataSize];
@@ -93,9 +93,9 @@
delete [] temp;
throw STDNS runtime_error("I/O error");
}
-diff --recursive --unified=3 original/cgicc-3.1.4/cgicc/CgiUtils.h
modified/cgicc-3.1.4/cgicc/CgiUtils.h
+diff --recursive '--unified=3' original/cgicc-3.1.4/cgicc/CgiUtils.h
modified/cgicc-3.1.4/cgicc/CgiUtils.h
--- original/cgicc-3.1.4/cgicc/CgiUtils.h 1999-08-09 23:03:41.000000000
+0000
-+++ modified/cgicc-3.1.4/cgicc/CgiUtils.h 2007-11-01 12:39:20.000000000
+0000
++++ modified/cgicc-3.1.4/cgicc/CgiUtils.h 2016-01-18 13:59:21.328125000
+0000
@@ -32,10 +32,12 @@
#include "cgicc/CgiDefs.h"
@@ -112,9 +112,9 @@
#define LOG(s) gLogFile << s;
#else
-diff --recursive --unified=3 original/cgicc-3.1.4/cgicc/Cgicc.cpp
modified/cgicc-3.1.4/cgicc/Cgicc.cpp
+diff --recursive '--unified=3' original/cgicc-3.1.4/cgicc/Cgicc.cpp
modified/cgicc-3.1.4/cgicc/Cgicc.cpp
--- original/cgicc-3.1.4/cgicc/Cgicc.cpp 1999-10-02 19:10:10.000000000
+0000
-+++ modified/cgicc-3.1.4/cgicc/Cgicc.cpp 2007-11-01 12:47:02.000000000
+0000
++++ modified/cgicc-3.1.4/cgicc/Cgicc.cpp 2016-01-18 14:04:52.000000000
+0000
@@ -27,7 +27,7 @@
#include <functional>
#include <iterator>
@@ -124,6 +124,15 @@
#include <sys/time.h>
#else
#include <time.h>
+@@ -98,7 +98,7 @@
+ // "The C++ Programming Language, Third Edition" by Bjarne Stroustrup
+ template<class In, class Out, class Pred>
+ Out
+-copy_if(In first,
++CGICC_copy_if(In first,
+ In last,
+ Out res,
+ Pred p)
@@ -190,8 +190,10 @@
CGICCNS Cgicc::Cgicc()
: fEnvironment()
@@ -137,9 +146,34 @@
time_t now;
tm *date;
char s[80];
-diff --recursive --unified=3 original/cgicc-3.1.4/cgicc/FormEntry.h
modified/cgicc-3.1.4/cgicc/FormEntry.h
+@@ -250,7 +252,8 @@
+ {
+ LOGLN("Cgicc::restore")
+
+- ((CgiEnvironment&)getEnvironment()).restore(filename);
++// ((CgiEnvironment&)getEnvironment()).restore(filename);
++ const_cast<CgiEnvironment&>(getEnvironment()).restore(filename);
+
+ // clear the current data and re-parse the enviroment
+ fFormData.clear();
+@@ -336,12 +339,12 @@
+ result.clear();
+
+ if(byName)
+- copy_if(fFormData.begin(),
++ CGICC_copy_if(fFormData.begin(),
+ fFormData.end(),
+ STDNS back_inserter(result),
+ FE_nameCompare(param));
+ else
+- copy_if(fFormData.begin(),
++ CGICC_copy_if(fFormData.begin(),
+ fFormData.end(),
+ STDNS back_inserter(result),
+ FE_valueCompare(param));
+diff --recursive '--unified=3' original/cgicc-3.1.4/cgicc/FormEntry.h
modified/cgicc-3.1.4/cgicc/FormEntry.h
--- original/cgicc-3.1.4/cgicc/FormEntry.h 1999-08-16 17:40:04.000000000
+0000
-+++ modified/cgicc-3.1.4/cgicc/FormEntry.h 2007-07-31 16:05:58.000000000
+0000
++++ modified/cgicc-3.1.4/cgicc/FormEntry.h 2016-01-18 13:59:21.328125000
+0000
@@ -96,7 +96,7 @@
#ifdef WIN32
/** Dummy operator for MSVC++ */
@@ -149,9 +183,9 @@
{ return false; }
#endif
-diff --recursive --unified=3 original/cgicc-3.1.4/cgicc/FormFile.h
modified/cgicc-3.1.4/cgicc/FormFile.h
+diff --recursive '--unified=3' original/cgicc-3.1.4/cgicc/FormFile.h
modified/cgicc-3.1.4/cgicc/FormFile.h
--- original/cgicc-3.1.4/cgicc/FormFile.h 1999-08-16 17:40:04.000000000
+0000
-+++ modified/cgicc-3.1.4/cgicc/FormFile.h 2007-07-31 16:06:22.000000000
+0000
++++ modified/cgicc-3.1.4/cgicc/FormFile.h 2016-01-18 13:59:21.343750000
+0000
@@ -100,7 +100,7 @@
#ifdef WIN32
/** Dummy operator for MSVC++ */
@@ -161,9 +195,9 @@
{ return false; }
#endif
-diff --recursive --unified=3 original/cgicc-3.1.4/cgicc/HTMLAttributes.h
modified/cgicc-3.1.4/cgicc/HTMLAttributes.h
+diff --recursive '--unified=3' original/cgicc-3.1.4/cgicc/HTMLAttributes.h
modified/cgicc-3.1.4/cgicc/HTMLAttributes.h
--- original/cgicc-3.1.4/cgicc/HTMLAttributes.h 2000-10-07
18:41:18.000000000 +0000
-+++ modified/cgicc-3.1.4/cgicc/HTMLAttributes.h 2007-07-31
16:06:38.000000000 +0000
++++ modified/cgicc-3.1.4/cgicc/HTMLAttributes.h 2016-01-18
13:59:21.359375000 +0000
@@ -100,7 +100,7 @@
#ifdef WIN32
/** Dummy operator for MSVC++ */
@@ -173,9 +207,20 @@
{ return false; }
#endif
-diff --recursive --unified=3 original/cgicc-3.1.4/cgicc/HTMLElements.h
modified/cgicc-3.1.4/cgicc/HTMLElements.h
+diff --recursive '--unified=3' original/cgicc-3.1.4/cgicc/HTMLElements.cpp
modified/cgicc-3.1.4/cgicc/HTMLElements.cpp
+--- original/cgicc-3.1.4/cgicc/HTMLElements.cpp 2000-09-21
15:21:28.000000000 +0000
++++ modified/cgicc-3.1.4/cgicc/HTMLElements.cpp 2016-01-18
14:02:24.000000000 +0000
+@@ -22,6 +22,7 @@
+ # pragma implementation
+ #endif
+
++#include <cstring> // strcmp()
+ #include <new>
+
+ #include "cgicc/HTMLElements.h"
+diff --recursive '--unified=3' original/cgicc-3.1.4/cgicc/HTMLElements.h
modified/cgicc-3.1.4/cgicc/HTMLElements.h
--- original/cgicc-3.1.4/cgicc/HTMLElements.h 2000-07-03 02:54:03.000000000
+0000
-+++ modified/cgicc-3.1.4/cgicc/HTMLElements.h 2007-07-31 16:08:04.000000000
+0000
++++ modified/cgicc-3.1.4/cgicc/HTMLElements.h 2016-01-18 13:59:21.359375000
+0000
@@ -83,7 +83,7 @@
#ifdef WIN32
/** Dummy operator for MSVC++ */
@@ -185,9 +230,9 @@
{ return false; }
#endif
-diff --recursive --unified=3 original/cgicc-3.1.4/cgicc/HTTPHeaders.h
modified/cgicc-3.1.4/cgicc/HTTPHeaders.h
+diff --recursive '--unified=3' original/cgicc-3.1.4/cgicc/HTTPHeaders.h
modified/cgicc-3.1.4/cgicc/HTTPHeaders.h
--- original/cgicc-3.1.4/cgicc/HTTPHeaders.h 1999-08-16 17:40:05.000000000
+0000
-+++ modified/cgicc-3.1.4/cgicc/HTTPHeaders.h 2007-07-31 16:08:24.000000000
+0000
++++ modified/cgicc-3.1.4/cgicc/HTTPHeaders.h 2016-01-18 13:59:21.375000000
+0000
@@ -155,7 +155,7 @@
#ifdef WIN32
/** Dummy operator for MSVC++ */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [lmi-commits] [6476] Repair defects detected by gcc-4.9.2,
Greg Chicares <=