[[ Cleanup ]] revxml: Use const C strings whereever appropriate.

peter-b · peter-b · commit e4cc1b662d90 · 2014-12-08T09:53:56.000Z
Removes a large number of GCC "write-strings" warnings.
diff --git a/revxml/src/cxml.h b/revxml/src/cxml.h
@@ -50,8 +50,8 @@ class CXMLAttribute;
 //xmldoc.cpp
 int util_strnicmp(const char *s1, const char *s2, int n);
 int util_strncmp(const char *s1, const char *s2, int n);
-void util_concatstring(char *s, int slen, char *&d, int &dlen, int &dalloc);
-char *util_strchr(char *sptr, char target, int l);
+void util_concatstring(const char *s, int slen, char *&d, int &dlen, int &dalloc);
+const char *util_strchr(const char *sptr, char target, int l);
 
 extern void CB_startDocument();
 extern void CB_endDocument();
diff --git a/revxml/src/revxml.cpp b/revxml/src/revxml.cpp
@@ -217,7 +217,7 @@ void REVXML_QUIT()
 }
 
 //------------------------------------UTILITY FUNCTIONS--------------------------
-void DispatchMetaCardMessage(char *messagename,char *tmessage)
+void DispatchMetaCardMessage(const char *messagename, const char *tmessage)
 {
 int retvalue = 0;
 SetGlobal("xmlvariable",tmessage,&retvalue);
@@ -227,7 +227,7 @@ sprintf(mcmessage,"global xmlvariable;try;send \"%s xmlvariable\" to current car
 SendCardMessage(mcmessage, &retvalue);
 }
 
-bool stringToBool(char *p_string)
+bool stringToBool(const char *p_string)
 {
 	if (stricmp(p_string, "true") == 0)
 		return true;
diff --git a/revxml/src/xmldoc.cpp b/revxml/src/xmldoc.cpp
@@ -62,7 +62,7 @@ int util_strncmp(const char *one, const char *two, int n)
   return 1;
 }
 
-char *util_strchr(char *sptr, char target, int l)
+const char *util_strchr(const char *sptr, char target, int l)
 {
   if (!l) l = strlen(sptr);
   const char *eptr = sptr + l;
@@ -76,7 +76,7 @@ char *util_strchr(char *sptr, char target, int l)
 }
 
 //utility function used to concat two strings..and reallocate string if neccessary
-void util_concatstring(char *s, int slen, char *&d, int &dlen, int &dalloc)
+void util_concatstring(const char *s, int slen, char *&d, int &dlen, int &dalloc)
 {
 	int newbufsize = dalloc;
 	while (dlen + slen + 1 > newbufsize)
@@ -408,7 +408,7 @@ Bool CXMLDocument::GetElementByPath(CXMLElement *telement, char *tpath)
 		return False;
 
 	if (*sptr == '/') sptr++;
-	char *nameend;
+	const char *nameend;
 	char *nextname = strchr(sptr, '/');
 	if (!nextname) 
 	{
@@ -418,7 +418,7 @@ Bool CXMLDocument::GetElementByPath(CXMLElement *telement, char *tpath)
 		isroot = True;
 		
 	}
-	char *numpointer = util_strchr(sptr,'[',nextname-sptr);
+	const char *numpointer = util_strchr(sptr,'[',nextname-sptr);
 	if (numpointer)
 			nameend = numpointer;
 	else
diff --git a/revxml/src/xmlelement.cpp b/revxml/src/xmlelement.cpp
@@ -615,16 +615,16 @@ return True if element found
 Bool CXMLElement::GoChildByPath(char *tpath)
 {
 	if (!isinited()) return False;
-	char *sptr = tpath;
+	const char *sptr = tpath;
 	char *childpointer = NULL;
 	CXMLElement telement;
 	telement.CopyElement(this);
 	if (*sptr == '/') sptr++; //skip first slash
 	Bool foundmatch = False;
-	char *endptr = sptr + strlen(sptr);
+	const char *endptr = sptr + strlen(sptr);
 	while (sptr < endptr)
 	{
-		char *namestart,*nameend,*nextname,*numpointer;
+		const char *namestart,*nameend,*nextname,*numpointer;
 		nextname = strchr(sptr, '/' );
 		if (!nextname) nextname = endptr;
 		namestart = sptr;

Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,7 @@ void REVXML_QUIT()`
`217`	`217`	`}`
`218`	`218`
`219`	`219`	`//------------------------------------UTILITY FUNCTIONS--------------------------`
`220`		`-void DispatchMetaCardMessage(char messagename,char tmessage)`
	`220`	`+void DispatchMetaCardMessage(const char messagename, const char tmessage)`
`221`	`221`	`{`
`222`	`222`	`int retvalue = 0;`
`223`	`223`	`SetGlobal("xmlvariable",tmessage,&retvalue);`
`@@ -227,7 +227,7 @@ sprintf(mcmessage,"global xmlvariable;try;send \"%s xmlvariable\" to current car`
`227`	`227`	`SendCardMessage(mcmessage, &retvalue);`
`228`	`228`	`}`
`229`	`229`
`230`		`-bool stringToBool(char *p_string)`
	`230`	`+bool stringToBool(const char *p_string)`
`231`	`231`	`{`
`232`	`232`	`if (stricmp(p_string, "true") == 0)`
`233`	`233`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ int util_strncmp(const char one, const char two, int n)`
`62`	`62`	`return 1;`
`63`	`63`	`}`
`64`	`64`
`65`		`-char util_strchr(char sptr, char target, int l)`
	`65`	`+const char util_strchr(const char sptr, char target, int l)`
`66`	`66`	`{`
`67`	`67`	`if (!l) l = strlen(sptr);`
`68`	`68`	`const char *eptr = sptr + l;`
`@@ -76,7 +76,7 @@ char util_strchr(char sptr, char target, int l)`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`//utility function used to concat two strings..and reallocate string if neccessary`
`79`		`-void util_concatstring(char s, int slen, char &d, int &dlen, int &dalloc)`
	`79`	`+void util_concatstring(const char s, int slen, char &d, int &dlen, int &dalloc)`
`80`	`80`	`{`
`81`	`81`	`int newbufsize = dalloc;`
`82`	`82`	`while (dlen + slen + 1 > newbufsize)`
`@@ -408,7 +408,7 @@ Bool CXMLDocument::GetElementByPath(CXMLElement telement, char tpath)`
`408`	`408`	`return False;`
`409`	`409`
`410`	`410`	`if (*sptr == '/') sptr++;`
`411`		`- char *nameend;`
	`411`	`+ const char *nameend;`
`412`	`412`	`char *nextname = strchr(sptr, '/');`
`413`	`413`	`if (!nextname)`
`414`	`414`	`{`
`@@ -418,7 +418,7 @@ Bool CXMLDocument::GetElementByPath(CXMLElement telement, char tpath)`
`418`	`418`	`isroot = True;`
`419`	`419`
`420`	`420`	`}`
`421`		`- char *numpointer = util_strchr(sptr,'[',nextname-sptr);`
	`421`	`+ const char *numpointer = util_strchr(sptr,'[',nextname-sptr);`
`422`	`422`	`if (numpointer)`
`423`	`423`	`nameend = numpointer;`
`424`	`424`	`else`