nokolexbor 0.2.4 → 0.2.6

data/ext/nokolexbor/xml_memory.c

@@ -48,14 +48,14 @@ void xmlMallocBreakpoint(void);
  ************************************************************************/
 
 #if !defined(LIBXML_THREAD_ENABLED) && !defined(LIBXML_THREAD_ALLOC_ENABLED)
-#ifdef xmlMalloc
-#undef xmlMalloc
+#ifdef nl_xmlMalloc
+#undef nl_xmlMalloc
 #endif
-#ifdef xmlRealloc
-#undef xmlRealloc
+#ifdef nl_xmlRealloc
+#undef nl_xmlRealloc
 #endif
-#ifdef xmlMemStrdup
-#undef xmlMemStrdup
+#ifdef nl_xmlMemStrdup
+#undef nl_xmlMemStrdup
 #endif
 #endif
 
@@ -119,13 +119,13 @@ static void debugmem_list_delete(MEMHDR *);
 #endif
 
 /**
- * xmlInitMemory:
+ * nl_xmlInitMemory:
  *
- * DEPRECATED: Alias for xmlInitParser.
+ * DEPRECATED: Alias for nl_xmlInitParser.
  */
 int
-xmlInitMemory(void) {
-    xmlInitParser();
+nl_xmlInitMemory(void) {
+    nl_xmlInitParser();
     return(0);
 }
 
@@ -140,8 +140,8 @@ void
 xmlInitMemoryInternal(void) {
      char *breakpoint;
 #ifdef DEBUG_MEMORY
-     xmlGenericError(xmlGenericErrorContext,
-	     "xmlInitMemory()\n");
+     nl_xmlGenericError(nl_xmlGenericErrorContext,
+	     "nl_xmlInitMemory()\n");
 #endif
      xmlInitMutex(&xmlMemMutex);
 
@@ -155,13 +155,13 @@ xmlInitMemoryInternal(void) {
      }
 
 #ifdef DEBUG_MEMORY
-     xmlGenericError(xmlGenericErrorContext,
-	     "xmlInitMemory() Ok\n");
+     nl_xmlGenericError(nl_xmlGenericErrorContext,
+	     "nl_xmlInitMemory() Ok\n");
 #endif
 }
 
 /**
- * xmlMemSetup:
+ * nl_xmlMemSetup:
  * @freeFunc: the free() function to use
  * @mallocFunc: the malloc() function to use
  * @reallocFunc: the realloc() function to use
@@ -176,11 +176,11 @@ xmlInitMemoryInternal(void) {
  * Returns 0 on success
  */
 int
-xmlMemSetup(xmlFreeFunc freeFunc, xmlMallocFunc mallocFunc,
+nl_xmlMemSetup(xmlFreeFunc freeFunc, xmlMallocFunc mallocFunc,
             xmlReallocFunc reallocFunc, xmlStrdupFunc strdupFunc) {
 #ifdef DEBUG_MEMORY
-     xmlGenericError(xmlGenericErrorContext,
-	     "xmlMemSetup()\n");
+     nl_xmlGenericError(nl_xmlGenericErrorContext,
+	     "nl_xmlMemSetup()\n");
 #endif
     if (freeFunc == NULL)
 	return(-1);
@@ -190,14 +190,14 @@ xmlMemSetup(xmlFreeFunc freeFunc, xmlMallocFunc mallocFunc,
 	return(-1);
     if (strdupFunc == NULL)
 	return(-1);
-    xmlFree = freeFunc;
-    xmlMalloc = mallocFunc;
-    xmlMallocAtomic = mallocFunc;
-    xmlRealloc = reallocFunc;
-    xmlMemStrdup = strdupFunc;
+    nl_xmlFree = freeFunc;
+    nl_xmlMalloc = mallocFunc;
+    nl_xmlMallocAtomic = mallocFunc;
+    nl_xmlRealloc = reallocFunc;
+    nl_xmlMemStrdup = strdupFunc;
 #ifdef DEBUG_MEMORY
-     xmlGenericError(xmlGenericErrorContext,
-	     "xmlMemSetup() Ok\n");
+     nl_xmlGenericError(nl_xmlGenericErrorContext,
+	     "nl_xmlMemSetup() Ok\n");
 #endif
     return(0);
 }

data/ext/nokolexbor/xml_parser.c

@@ -83,7 +83,7 @@
 static int xmlParserInitialized = 0;
 
 /**
- * xmlInitParser:
+ * nl_xmlInitParser:
  *
  * Initialization function for the XML parser.
  * This is not reentrant. Call once before processing in case of
@@ -91,7 +91,7 @@ static int xmlParserInitialized = 0;
  */
 
 void
-xmlInitParser(void) {
+nl_xmlInitParser(void) {
     /*
      * Note that the initialization code must not make memory allocations.
      */
@@ -103,7 +103,7 @@ xmlInitParser(void) {
     if (xmlParserInitialized == 0) {
 #endif
 #if defined(_WIN32) && (!defined(LIBXML_STATIC) || defined(LIBXML_STATIC_FOR_DLL))
-        if (xmlFree == free)
+        if (nl_xmlFree == free)
             atexit(xmlCleanupParser);
 #endif
 

data/ext/nokolexbor/xml_parserInternals.c

@@ -53,12 +53,12 @@ xmlErrMemory(xmlParserCtxtPtr ctxt, const char *extra)
         ctxt->disableSAX = 1;
     }
     if (extra)
-        __xmlRaiseError(NULL, NULL, NULL, ctxt, NULL, XML_FROM_PARSER,
+        __nl_xmlRaiseError(NULL, NULL, NULL, ctxt, NULL, XML_FROM_PARSER,
                         XML_ERR_NO_MEMORY, XML_ERR_FATAL, NULL, 0, extra,
                         NULL, NULL, 0, 0,
                         "Memory allocation failed : %s\n", extra);
     else
-        __xmlRaiseError(NULL, NULL, NULL, ctxt, NULL, XML_FROM_PARSER,
+        __nl_xmlRaiseError(NULL, NULL, NULL, ctxt, NULL, XML_FROM_PARSER,
                         XML_ERR_NO_MEMORY, XML_ERR_FATAL, NULL, 0, NULL,
                         NULL, NULL, 0, 0, "Memory allocation failed\n");
 }
@@ -82,7 +82,7 @@ __xmlErrEncoding(xmlParserCtxtPtr ctxt, xmlParserErrors xmlerr,
 	return;
     if (ctxt != NULL)
         ctxt->errNo = xmlerr;
-    __xmlRaiseError(NULL, NULL, NULL,
+    __nl_xmlRaiseError(NULL, NULL, NULL,
                     ctxt, NULL, XML_FROM_PARSER, xmlerr, XML_ERR_FATAL,
                     NULL, 0, (const char *) str1, (const char *) str2,
                     NULL, 0, 0, msg, str1, str2);
@@ -109,7 +109,7 @@ xmlErrInternal(xmlParserCtxtPtr ctxt, const char *msg, const xmlChar * str)
 	return;
     if (ctxt != NULL)
         ctxt->errNo = XML_ERR_INTERNAL_ERROR;
-    __xmlRaiseError(NULL, NULL, NULL,
+    __nl_xmlRaiseError(NULL, NULL, NULL,
                     ctxt, NULL, XML_FROM_PARSER, XML_ERR_INTERNAL_ERROR,
                     XML_ERR_FATAL, NULL, 0, (const char *) str, NULL, NULL,
                     0, 0, msg, str);
@@ -138,7 +138,7 @@ xmlErrEncodingInt(xmlParserCtxtPtr ctxt, xmlParserErrors error,
 	return;
     if (ctxt != NULL)
         ctxt->errNo = error;
-    __xmlRaiseError(NULL, NULL, NULL,
+    __nl_xmlRaiseError(NULL, NULL, NULL,
                     ctxt, NULL, XML_FROM_PARSER, error, XML_ERR_FATAL,
                     NULL, 0, NULL, NULL, NULL, val, 0, msg, val);
     if (ctxt != NULL) {
@@ -149,7 +149,7 @@ xmlErrEncodingInt(xmlParserCtxtPtr ctxt, xmlParserErrors error,
 }
 
 /**
- * xmlIsLetter:
+ * nl_xmlIsLetter:
  * @c:  an unicode character (int)
  *
  * Check whether the character is allowed by the production
@@ -158,12 +158,12 @@ xmlErrEncodingInt(xmlParserCtxtPtr ctxt, xmlParserErrors error,
  * Returns 0 if not, non-zero otherwise
  */
 int
-xmlIsLetter(int c) {
+nl_xmlIsLetter(int c) {
     return(IS_BASECHAR(c) || IS_IDEOGRAPHIC(c));
 }
 
 /**
- * xmlCopyCharMultiByte:
+ * nl_xmlCopyCharMultiByte:
  * @out:  pointer to an array of xmlChar
  * @val:  the char value
  *
@@ -172,7 +172,7 @@ xmlIsLetter(int c) {
  * Returns the number of xmlChar written
  */
 int
-xmlCopyCharMultiByte(xmlChar *out, int val) {
+nl_xmlCopyCharMultiByte(xmlChar *out, int val) {
     if ((out == NULL) || (val < 0)) return(0);
     /*
      * We are supposed to handle UTF8, check it's valid
@@ -191,7 +191,7 @@ xmlCopyCharMultiByte(xmlChar *out, int val) {
 	else if (val < 0x110000)  { *out++= (val >> 18) | 0xF0;  bits=  12; }
 	else {
 	    xmlErrEncodingInt(NULL, XML_ERR_INVALID_CHAR,
-		    "Internal error, xmlCopyCharMultiByte 0x%X out of bound\n",
+		    "Internal error, nl_xmlCopyCharMultiByte 0x%X out of bound\n",
 			      val);
 	    return(0);
 	}
@@ -204,7 +204,7 @@ xmlCopyCharMultiByte(xmlChar *out, int val) {
 }
 
 /**
- * xmlCopyChar:
+ * nl_xmlCopyChar:
  * @len:  Ignored, compatibility
  * @out:  pointer to an array of xmlChar
  * @val:  the char value
@@ -215,18 +215,18 @@ xmlCopyCharMultiByte(xmlChar *out, int val) {
  */
 
 int
-xmlCopyChar(int len ATTRIBUTE_UNUSED, xmlChar *out, int val) {
+nl_xmlCopyChar(int len ATTRIBUTE_UNUSED, xmlChar *out, int val) {
     if ((out == NULL) || (val < 0)) return(0);
     /* the len parameter is ignored */
     if  (val >= 0x80) {
-	return(xmlCopyCharMultiByte (out, val));
+	return(nl_xmlCopyCharMultiByte (out, val));
     }
     *out = val;
     return 1;
 }
 
 /**
- * xmlStringCurrentChar:
+ * nl_xmlStringCurrentChar:
  * @ctxt:  the XML parser context
  * @cur:  pointer to the beginning of the char
  * @len:  pointer to the length of the char read
@@ -238,7 +238,7 @@ xmlCopyChar(int len ATTRIBUTE_UNUSED, xmlChar *out, int val) {
  */
 
 int
-xmlStringCurrentChar(xmlParserCtxtPtr ctxt, const xmlChar * cur, int *len)
+nl_xmlStringCurrentChar(xmlParserCtxtPtr ctxt, const xmlChar * cur, int *len)
 {
     if ((len == NULL) || (cur == NULL)) return(0);
     if ((ctxt == NULL) || (ctxt->charset == XML_CHAR_ENCODING_UTF8)) {