[Easysoap-checkins] CVS: easysoap/src XMLComposer.cpp, 1.5, 1.6 XMLParser.cpp, 1.12, 1.13 digcalc.c, 1.4, 1.5

[David C. <dcr...@us...>]

Update of /cvsroot/easysoap/easysoap/src
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv14841

Modified Files:
	XMLComposer.cpp XMLParser.cpp digcalc.c 
Log Message:
Modifications so we can compile with VS2005

Index: XMLComposer.cpp
===================================================================
RCS file: /cvsroot/easysoap/easysoap/src/XMLComposer.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XMLComposer.cpp	2 Jun 2004 03:26:45 -0000	1.5
+++ XMLComposer.cpp	9 Nov 2006 07:24:45 -0000	1.6
@@ -50,10 +50,9 @@
 }
 
 const char *
-XMLComposer::GetSymbol(char *buff, const char *prefix)
+XMLComposer::GetSymbol(char *buff, size_t size, const char *prefix)
 {
-	// A bit dangerious here...
-	sprintf(buff, "%s%d", prefix, ++m_gensym);
+	snprintf(buff, size, "%s%d", prefix, ++m_gensym);
 	return buff;
 }
 
@@ -147,7 +146,7 @@
 			if (prefix)
 				nsprefix = prefix;
 			else
-				nsprefix = GetSymbol(buffer, "ns");
+				nsprefix = GetSymbol(buffer, sizeof(buffer), "ns");
 		}
 		else
 		{
@@ -186,7 +185,7 @@
 		if (!i)
 		{
 			addxmlns = true;
-			nsprefix = GetSymbol(buffer, "ns");
+			nsprefix = GetSymbol(buffer, sizeof(buffer), "ns");
 		}
 		else
 		{
@@ -230,7 +229,7 @@
 		if (!i)
 		{
 			addtns = true;
-			tnsprefix = GetSymbol(tbuff, "ns");
+			tnsprefix = GetSymbol(tbuff, sizeof(tbuff), "ns");
 		}
 		else
 		{
@@ -254,7 +253,7 @@
 		if (!i)
 		{
 			addvns = true;
-			vnsprefix = GetSymbol(vbuff, "ns");
+			vnsprefix = GetSymbol(vbuff, sizeof(vbuff), "ns");
 		}
 		else
 		{

Index: XMLParser.cpp
===================================================================
RCS file: /cvsroot/easysoap/easysoap/src/XMLParser.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- XMLParser.cpp	2 Jun 2004 06:33:05 -0000	1.12
+++ XMLParser.cpp	9 Nov 2006 07:24:45 -0000	1.13
@@ -23,8 +23,8 @@
 #pragma warning (disable: 4786)
 #endif // _MSC_VER
 
-#include <expat.h>
 #include <easysoap/XMLParser.h>
+#include <expat.h>
 
 #define EXPAT_VER(a,b,c) (((((a)*1000)+(b))*1000)+(c))
 #define EXPAT_VERSION EXPAT_VER(XML_MAJOR_VERSION,XML_MINOR_VERSION,XML_MICRO_VERSION)

Index: digcalc.c
===================================================================
RCS file: /cvsroot/easysoap/easysoap/src/digcalc.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- digcalc.c	19 Sep 2002 20:47:19 -0000	1.4
+++ digcalc.c	9 Nov 2006 07:24:45 -0000	1.5
@@ -9,7 +9,11 @@
 #define STRICMP strcasecmp
 #else
 #ifdef HAVE_STRICMP
+#if _MSC_VER >= 1400
+#define STRICMP _stricmp
+#else
 #define STRICMP stricmp
+#endif
 #else
 #error "No stricmp function."
 #endif