[xmppd-dev] commit r1523 - trunk/jabberd14/jabberd/lib

[mail at jabberd.org]

Author: mawis
Date: Tue Apr 29 15:30:46 2008
New Revision: 1523

Log:
Making jabberd/lib compile without warnings for deprecated string conversions


Modified:
   trunk/jabberd14/jabberd/lib/expat.cc
   trunk/jabberd14/jabberd/lib/jabberdlib.h

Modified: trunk/jabberd14/jabberd/lib/expat.cc
==============================================================================
--- trunk/jabberd14/jabberd/lib/expat.cc	(original)
+++ trunk/jabberd14/jabberd/lib/expat.cc	Tue Apr 29 15:30:46 2008
@@ -67,7 +67,7 @@
  */
 void expat_startElement(void* userdata, const char* name, const char** atts) {
     char *prefix = NULL;
-    char *ns_iri = NULL;
+    char const *ns_iri = NULL;
     char *local_name = NULL;
 
     /* get the data we are working on */
@@ -220,7 +220,6 @@
     XML_SetCharacterDataHandler(p, expat_charData);
     XML_SetNamespaceDeclHandler(p, expat_startNamespaceDecl, expat_endNamespaceDecl);
     if(!XML_Parse(p, str, len, 1)) {
-        /*        jdebug(ZONE,"xmlnode_str_error: %s",(char *)XML_ErrorString(XML_GetErrorCode(p)));*/
         xmlnode_free(callback_data.x);
 	callback_data.x = NULL;
     }
@@ -263,7 +262,6 @@
         done = len < BUFSIZ;
         if(!XML_Parse(p, buf, len, done))
         {
-            /*            jdebug(ZONE,"xmlnode_file_parseerror: %s",(char *)XML_ErrorString(XML_GetErrorCode(p)));*/
             xmlnode_free(callback_data.x);
 	    callback_data.x = NULL;
             done = 1;
@@ -285,7 +283,7 @@
  * @param file the filename
  * @return pointer to a message why parsing failed, NULL if parsing did not fail
  */
-char* xmlnode_file_borked(char const* file) {
+char const* xmlnode_file_borked(char const* file) {
     XML_Parser p;
     char buf[BUFSIZ];
     static char err[1024];
@@ -412,7 +410,7 @@
 
     while (atts[i] != '\0') {
 	char *prefix = NULL;
-	char *ns_iri = NULL;
+	char const* ns_iri = NULL;
 	char *local_name = NULL;
 
 	/* get prefix, iri, and local name of the element */

Modified: trunk/jabberd14/jabberd/lib/jabberdlib.h
==============================================================================
--- trunk/jabberd14/jabberd/lib/jabberdlib.h	(original)
+++ trunk/jabberd14/jabberd/lib/jabberdlib.h	Tue Apr 29 15:30:46 2008
@@ -646,7 +646,7 @@
 void     xmlnode_insert_node(xmlnode parent, xmlnode node);
 xmlnode  xmlnode_str(const char *str, int len);
 xmlnode  xmlnode_file(const char *file);
-char*    xmlnode_file_borked(char const *file); /* same as _file but returns the parsing error */
+char const*    xmlnode_file_borked(char const *file); /* same as _file but returns the parsing error */
 xmlnode  xmlnode_dup(xmlnode x); /* duplicate x */
 xmlnode  xmlnode_dup_pool(pool p, xmlnode x);