nokolexbor 0.2.5 → 0.2.6

data/ext/nokolexbor/nl_xpath_context.c

@@ -18,7 +18,7 @@ VALUE cNokolexborXpathSyntaxError;
 static void
 free_xml_xpath_context(xmlXPathContextPtr ctx)
 {
-  xmlXPathFreeContext(ctx);
+  nl_xmlXPathFreeContext(ctx);
 }
 
 /*
@@ -33,7 +33,7 @@ nl_xpath_context_register_ns(VALUE self, VALUE prefix, VALUE uri)
   xmlXPathContextPtr ctx;
   Data_Get_Struct(self, xmlXPathContext, ctx);
 
-  xmlXPathRegisterNs(ctx,
+  nl_xmlXPathRegisterNs(ctx,
                      (const xmlChar *)StringValueCStr(prefix),
                      (const xmlChar *)StringValueCStr(uri));
   return self;
@@ -52,9 +52,9 @@ nl_xpath_context_register_variable(VALUE self, VALUE name, VALUE value)
   xmlXPathObjectPtr xmlValue;
   Data_Get_Struct(self, xmlXPathContext, ctx);
 
-  xmlValue = xmlXPathNewCString(StringValueCStr(value));
+  xmlValue = nl_xmlXPathNewCString(StringValueCStr(value));
 
-  xmlXPathRegisterVariable(ctx,
+  nl_xmlXPathRegisterVariable(ctx,
                            (const xmlChar *)StringValueCStr(name),
                            xmlValue);
 
@@ -74,7 +74,7 @@ xpath2ruby(xmlXPathObjectPtr c_xpath_object, xmlXPathContextPtr ctx, VALUE rb_do
   {
   case XPATH_STRING:
     rb_retval = rb_utf8_str_new_cstr((const char *)c_xpath_object->stringval);
-    xmlFree(c_xpath_object->stringval);
+    nl_xmlFree(c_xpath_object->stringval);
     return rb_retval;
 
   case XPATH_NODESET:
@@ -192,20 +192,20 @@ nl_xpath_context_evaluate(int argc, VALUE *argv, VALUE self)
   // if (Qnil != xpath_handler) {
   //   /* FIXME: not sure if this is the correct place to shove private data. */
   //   ctx->userData = (void *)xpath_handler;
-  //   xmlXPathRegisterFuncLookup(ctx, handler_lookup, (void *)xpath_handler);
+  //   nl_xmlXPathRegisterFuncLookup(ctx, handler_lookup, (void *)xpath_handler);
   // }
 
-  xmlSetStructuredErrorFunc((void *)errors, nl_xpath_error_array_pusher);
-  xmlSetGenericErrorFunc((void *)errors, nl_xpath_generic_exception_pusher);
+  nl_xmlSetStructuredErrorFunc((void *)errors, nl_xpath_error_array_pusher);
+  nl_xmlSetGenericErrorFunc((void *)errors, nl_xpath_generic_exception_pusher);
 
-  xpath = xmlXPathEvalExpression(query, ctx);
+  xpath = nl_xmlXPathEvalExpression(query, ctx);
 
-  xmlSetStructuredErrorFunc(NULL, NULL);
-  xmlSetGenericErrorFunc(NULL, NULL);
+  nl_xmlSetStructuredErrorFunc(NULL, NULL);
+  nl_xmlSetGenericErrorFunc(NULL, NULL);
 
   if (xpath == NULL)
   {
-    xmlXPathFreeObject(xpath);
+    nl_xmlXPathFreeObject(xpath);
     rb_exc_raise(rb_ary_entry(errors, 0));
   }
 
@@ -215,7 +215,7 @@ nl_xpath_context_evaluate(int argc, VALUE *argv, VALUE self)
     retval = rb_funcall(cNokolexborNodeSet, rb_intern("new"), 1, rb_ary_new());
   }
 
-  xmlXPathFreeObject(xpath);
+  nl_xmlXPathFreeObject(xpath);
 
   return retval;
 }
@@ -234,7 +234,7 @@ nl_xpath_context_new(VALUE klass, VALUE rb_node)
 
   lxb_dom_node_t *node = nl_rb_node_unwrap(rb_node);
 
-  ctx = xmlXPathNewContext(node->owner_document);
+  ctx = nl_xmlXPathNewContext(node->owner_document);
   ctx->node = node;
 
   self = Data_Wrap_Struct(klass, 0, free_xml_xpath_context, ctx);
@@ -246,9 +246,9 @@ nl_xpath_context_new(VALUE klass, VALUE rb_node)
 void Init_nl_xpath_context(void)
 {
 #ifndef NOKOLEXBOR_ASAN
-  xmlMemSetup((xmlFreeFunc)ruby_xfree, (xmlMallocFunc)ruby_xmalloc, (xmlReallocFunc)ruby_xrealloc, ruby_strdup);
+  nl_xmlMemSetup((xmlFreeFunc)ruby_xfree, (xmlMallocFunc)ruby_xmalloc, (xmlReallocFunc)ruby_xrealloc, ruby_strdup);
 #else
-  xmlMemSetup((xmlFreeFunc)free, (xmlMallocFunc)malloc, (xmlReallocFunc)realloc, strdup);
+  nl_xmlMemSetup((xmlFreeFunc)free, (xmlMallocFunc)malloc, (xmlReallocFunc)realloc, strdup);
 #endif
 
   cNokolexborXpathContext = rb_define_class_under(mNokolexbor, "XPathContext", rb_cObject);

data/ext/nokolexbor/private/buf.h

@@ -43,7 +43,7 @@ xmlBufIsEmpty(const xmlBufPtr buf);
 XML_HIDDEN int
 xmlBufAddLen(xmlBufPtr buf, size_t len);
 
-/* const xmlChar * xmlBufContent(const xmlBuf *buf); */
+/* const xmlChar * nl_xmlBufContent(const xmlBuf *buf); */
 /* const xmlChar * xmlBufEnd(xmlBufPtr buf); */
 
 XML_HIDDEN xmlChar *

data/ext/nokolexbor/private/error.h

@@ -5,17 +5,17 @@
 #include "libxml/xmlversion.h"
 
 XML_HIDDEN void
-__xmlRaiseError(xmlStructuredErrorFunc schannel,
+__nl_xmlRaiseError(xmlStructuredErrorFunc schannel,
                 xmlGenericErrorFunc channel, void *data, void *ctx,
                 void *nod, int domain, int code, xmlErrorLevel level,
                 const char *file, int line, const char *str1,
                 const char *str2, const char *str3, int int1, int col,
 	        const char *msg, ...) LIBXML_ATTR_FORMAT(16,17);
 XML_HIDDEN void
-__xmlSimpleError(int domain, int code, lxb_dom_node_t_ptr node,
+__nl_xmlSimpleError(int domain, int code, lxb_dom_node_t_ptr node,
                  const char *msg, const char *extra) LIBXML_ATTR_FORMAT(4,0);
 XML_HIDDEN void
-xmlGenericErrorDefaultFunc(void *ctx, const char *msg,
+nl_xmlGenericErrorDefaultFunc(void *ctx, const char *msg,
                            ...) LIBXML_ATTR_FORMAT(2,3);
 
 #endif /* XML_ERROR_H_PRIVATE__ */

data/ext/nokolexbor/xml_SAX2.c

@@ -16,7 +16,7 @@
 #include "libxml/globals.h"
 
 /**
- * xmlSAX2GetPublicId:
+ * nl_xmlSAX2GetPublicId:
  * @ctx: the user data (XML parser context)
  *
  * Provides the public ID e.g. "-//SGMLSOURCE//DTD DEMO//EN"
@@ -24,14 +24,14 @@
  * Returns a xmlChar *
  */
 const xmlChar *
-xmlSAX2GetPublicId(void *ctx ATTRIBUTE_UNUSED)
+nl_xmlSAX2GetPublicId(void *ctx ATTRIBUTE_UNUSED)
 {
     /* xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) ctx; */
     return(NULL);
 }
 
 /**
- * xmlSAX2GetSystemId:
+ * nl_xmlSAX2GetSystemId:
  * @ctx: the user data (XML parser context)
  *
  * Provides the system ID, basically URL or filename e.g.
@@ -40,7 +40,7 @@ xmlSAX2GetPublicId(void *ctx ATTRIBUTE_UNUSED)
  * Returns a xmlChar *
  */
 const xmlChar *
-xmlSAX2GetSystemId(void *ctx)
+nl_xmlSAX2GetSystemId(void *ctx)
 {
     xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) ctx;
     if ((ctx == NULL) || (ctxt->input == NULL)) return(NULL);
@@ -48,7 +48,7 @@ xmlSAX2GetSystemId(void *ctx)
 }
 
 /**
- * xmlSAX2GetLineNumber:
+ * nl_xmlSAX2GetLineNumber:
  * @ctx: the user data (XML parser context)
  *
  * Provide the line number of the current parsing point.
@@ -56,7 +56,7 @@ xmlSAX2GetSystemId(void *ctx)
  * Returns an int
  */
 int
-xmlSAX2GetLineNumber(void *ctx)
+nl_xmlSAX2GetLineNumber(void *ctx)
 {
     xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) ctx;
     if ((ctx == NULL) || (ctxt->input == NULL)) return(0);
@@ -64,7 +64,7 @@ xmlSAX2GetLineNumber(void *ctx)
 }
 
 /**
- * xmlSAX2GetColumnNumber:
+ * nl_xmlSAX2GetColumnNumber:
  * @ctx: the user data (XML parser context)
  *
  * Provide the column number of the current parsing point.
@@ -72,7 +72,7 @@ xmlSAX2GetLineNumber(void *ctx)
  * Returns an int
  */
 int
-xmlSAX2GetColumnNumber(void *ctx)
+nl_xmlSAX2GetColumnNumber(void *ctx)
 {
     xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) ctx;
     if ((ctx == NULL) || (ctxt->input == NULL)) return(0);

data/ext/nokolexbor/xml_buf.c

@@ -92,7 +92,7 @@ struct _xmlBuf {
 static void
 xmlBufMemoryError(xmlBufPtr buf, const char *extra)
 {
-    __xmlSimpleError(XML_FROM_BUFFER, XML_ERR_NO_MEMORY, NULL, NULL, extra);
+    __nl_xmlSimpleError(XML_FROM_BUFFER, XML_ERR_NO_MEMORY, NULL, NULL, extra);
     if ((buf) && (buf->error == 0))
         buf->error = XML_ERR_NO_MEMORY;
 }
@@ -107,7 +107,7 @@ xmlBufPtr
 xmlBufCreate(void) {
     xmlBufPtr ret;
 
-    ret = (xmlBufPtr) xmlMalloc(sizeof(xmlBuf));
+    ret = (xmlBufPtr) nl_xmlMalloc(sizeof(xmlBuf));
     if (ret == NULL) {
 	xmlBufMemoryError(NULL, "creating buffer");
         return(NULL);
@@ -115,13 +115,13 @@ xmlBufCreate(void) {
     ret->use = 0;
     ret->error = 0;
     ret->buffer = NULL;
-    ret->size = xmlDefaultBufferSize;
+    ret->size = nl_xmlDefaultBufferSize;
     UPDATE_COMPAT(ret);
-    ret->alloc = xmlBufferAllocScheme;
-    ret->content = (xmlChar *) xmlMallocAtomic(ret->size);
+    ret->alloc = nl_xmlBufferAllocScheme;
+    ret->content = (xmlChar *) nl_xmlMallocAtomic(ret->size);
     if (ret->content == NULL) {
 	xmlBufMemoryError(ret, "creating buffer");
-	xmlFree(ret);
+	nl_xmlFree(ret);
         return(NULL);
     }
     ret->content[0] = 0;
@@ -140,7 +140,7 @@ void
 xmlBufFree(xmlBufPtr buf) {
     if (buf == NULL) {
 #ifdef DEBUG_BUFFER
-        xmlGenericError(xmlGenericErrorContext,
+        nl_xmlGenericError(nl_xmlGenericErrorContext,
 		"xmlBufFree: buf == NULL\n");
 #endif
 	return;
@@ -148,15 +148,15 @@ xmlBufFree(xmlBufPtr buf) {
 
     if ((buf->alloc == XML_BUFFER_ALLOC_IO) &&
         (buf->contentIO != NULL)) {
-        xmlFree(buf->contentIO);
+        nl_xmlFree(buf->contentIO);
     } else if (buf->content != NULL) {
-        xmlFree(buf->content);
+        nl_xmlFree(buf->content);
     }
-    xmlFree(buf);
+    nl_xmlFree(buf);
 }
 
 /**
- * xmlBufContent:
+ * nl_xmlBufContent:
  * @buf:  the buffer
  *
  * Function to extract the content of a buffer
@@ -165,7 +165,7 @@ xmlBufFree(xmlBufPtr buf) {
  */
 
 xmlChar *
-xmlBufContent(const xmlBuf *buf)
+nl_xmlBufContent(const xmlBuf *buf)
 {
     if ((!buf) || (buf->error))
         return NULL;
@@ -258,7 +258,7 @@ xmlBufResize(xmlBufPtr buf, size_t size)
 	    buf->content[buf->use] = 0;
 	    buf->size += start_buf;
 	} else {
-	    rebuf = (xmlChar *) xmlRealloc(buf->contentIO, start_buf + newSize);
+	    rebuf = (xmlChar *) nl_xmlRealloc(buf->contentIO, start_buf + newSize);
 	    if (rebuf == NULL) {
 		xmlBufMemoryError(buf, "growing buffer");
 		return 0;
@@ -268,21 +268,21 @@ xmlBufResize(xmlBufPtr buf, size_t size)
 	}
     } else {
 	if (buf->content == NULL) {
-	    rebuf = (xmlChar *) xmlMallocAtomic(newSize);
+	    rebuf = (xmlChar *) nl_xmlMallocAtomic(newSize);
 	    buf->use = 0;
 	    rebuf[buf->use] = 0;
 	} else if (buf->size - buf->use < 100) {
-	    rebuf = (xmlChar *) xmlRealloc(buf->content, newSize);
+	    rebuf = (xmlChar *) nl_xmlRealloc(buf->content, newSize);
         } else {
 	    /*
 	     * if we are reallocating a buffer far from being full, it's
 	     * better to make a new allocation and copy only the used range
 	     * and free the old one.
 	     */
-	    rebuf = (xmlChar *) xmlMallocAtomic(newSize);
+	    rebuf = (xmlChar *) nl_xmlMallocAtomic(newSize);
 	    if (rebuf != NULL) {
 		memcpy(rebuf, buf->content, buf->use);
-		xmlFree(buf->content);
+		nl_xmlFree(buf->content);
 		rebuf[buf->use] = 0;
 	    }
 	}
@@ -320,7 +320,7 @@ xmlBufAdd(xmlBufPtr buf, const xmlChar *str, int len) {
 
     if (len < -1) {
 #ifdef DEBUG_BUFFER
-        xmlGenericError(xmlGenericErrorContext,
+        nl_xmlGenericError(nl_xmlGenericErrorContext,
 		"xmlBufAdd: len < 0\n");
 #endif
 	return -1;
@@ -328,7 +328,7 @@ xmlBufAdd(xmlBufPtr buf, const xmlChar *str, int len) {
     if (len == 0) return 0;
 
     if (len < 0)
-        len = xmlStrlen(str);
+        len = nl_xmlStrlen(str);
 
     if (len < 0) return -1;
     if (len == 0) return 0;

data/ext/nokolexbor/xml_chvalid.c

@@ -22,7 +22,7 @@
  * allowed.
  *
  */
-const unsigned char xmlIsPubidChar_tab[256] = {
+const unsigned char nl_xmlIsPubidChar_tab[256] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00,
     0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01,
@@ -96,13 +96,13 @@ static const xmlChSRange xmlIsBaseChar_srng[] = { {0x100, 0x131},
     {0x1fd6, 0x1fdb}, {0x1fe0, 0x1fec}, {0x1ff2, 0x1ff4}, {0x1ff6, 0x1ffc},
     {0x2126, 0x2126}, {0x212a, 0x212b}, {0x212e, 0x212e}, {0x2180, 0x2182},
     {0x3041, 0x3094}, {0x30a1, 0x30fa}, {0x3105, 0x312c}, {0xac00, 0xd7a3}};
-const xmlChRangeGroup xmlIsBaseCharGroup =
+const xmlChRangeGroup nl_xmlIsBaseCharGroup =
 	{197, 0, xmlIsBaseChar_srng, (xmlChLRangePtr)0};
 
 static const xmlChSRange xmlIsChar_srng[] = { {0x100, 0xd7ff},
     {0xe000, 0xfffd}};
 static const xmlChLRange xmlIsChar_lrng[] = { {0x10000, 0x10ffff}};
-const xmlChRangeGroup xmlIsCharGroup =
+const xmlChRangeGroup nl_xmlIsCharGroup =
 	{2, 1, xmlIsChar_srng, xmlIsChar_lrng};
 
 static const xmlChSRange xmlIsCombining_srng[] = { {0x300, 0x345},
@@ -130,7 +130,7 @@ static const xmlChSRange xmlIsCombining_srng[] = { {0x300, 0x345},
     {0xf90, 0xf95}, {0xf97, 0xf97}, {0xf99, 0xfad}, {0xfb1, 0xfb7},
     {0xfb9, 0xfb9}, {0x20d0, 0x20dc}, {0x20e1, 0x20e1}, {0x302a, 0x302f},
     {0x3099, 0x3099}, {0x309a, 0x309a}};
-const xmlChRangeGroup xmlIsCombiningGroup =
+const xmlChRangeGroup nl_xmlIsCombiningGroup =
 	{95, 0, xmlIsCombining_srng, (xmlChLRangePtr)0};
 
 static const xmlChSRange xmlIsDigit_srng[] = { {0x660, 0x669},
@@ -138,24 +138,24 @@ static const xmlChSRange xmlIsDigit_srng[] = { {0x660, 0x669},
     {0xae6, 0xaef}, {0xb66, 0xb6f}, {0xbe7, 0xbef}, {0xc66, 0xc6f},
     {0xce6, 0xcef}, {0xd66, 0xd6f}, {0xe50, 0xe59}, {0xed0, 0xed9},
     {0xf20, 0xf29}};
-const xmlChRangeGroup xmlIsDigitGroup =
+const xmlChRangeGroup nl_xmlIsDigitGroup =
 	{14, 0, xmlIsDigit_srng, (xmlChLRangePtr)0};
 
 static const xmlChSRange xmlIsExtender_srng[] = { {0x2d0, 0x2d0},
     {0x2d1, 0x2d1}, {0x387, 0x387}, {0x640, 0x640}, {0xe46, 0xe46},
     {0xec6, 0xec6}, {0x3005, 0x3005}, {0x3031, 0x3035}, {0x309d, 0x309e},
     {0x30fc, 0x30fe}};
-const xmlChRangeGroup xmlIsExtenderGroup =
+const xmlChRangeGroup nl_xmlIsExtenderGroup =
 	{10, 0, xmlIsExtender_srng, (xmlChLRangePtr)0};
 
 static const xmlChSRange xmlIsIdeographic_srng[] = { {0x3007, 0x3007},
     {0x3021, 0x3029}, {0x4e00, 0x9fa5}};
-const xmlChRangeGroup xmlIsIdeographicGroup =
+const xmlChRangeGroup nl_xmlIsIdeographicGroup =
 	{3, 0, xmlIsIdeographic_srng, (xmlChLRangePtr)0};
 
 
 /**
- * xmlCharInRange:
+ * nl_xmlCharInRange:
  * @val: character to be validated
  * @rptr: pointer to range to be used to validate
  *
@@ -165,7 +165,7 @@ const xmlChRangeGroup xmlIsIdeographicGroup =
  * Returns: true if character valid, false otherwise
  */
 int
-xmlCharInRange (unsigned int val, const xmlChRangeGroup *rptr) {
+nl_xmlCharInRange (unsigned int val, const xmlChRangeGroup *rptr) {
     int low, high, mid;
     const xmlChSRange *sptr;
     const xmlChLRange *lptr;
@@ -214,7 +214,7 @@ xmlCharInRange (unsigned int val, const xmlChRangeGroup *rptr) {
 
 
 /**
- * xmlIsBaseChar:
+ * nl_xmlIsBaseChar:
  * @ch:  character to validate
  *
  * This function is DEPRECATED.
@@ -223,13 +223,13 @@ xmlCharInRange (unsigned int val, const xmlChRangeGroup *rptr) {
  * Returns true if argument valid, false otherwise
  */
 int
-xmlIsBaseChar(unsigned int ch) {
+nl_xmlIsBaseChar(unsigned int ch) {
     return(xmlIsBaseCharQ(ch));
 }
 
 
 /**
- * xmlIsBlank:
+ * nl_xmlIsBlank:
  * @ch:  character to validate
  *
  * This function is DEPRECATED.
@@ -238,13 +238,13 @@ xmlIsBaseChar(unsigned int ch) {
  * Returns true if argument valid, false otherwise
  */
 int
-xmlIsBlank(unsigned int ch) {
+nl_xmlIsBlank(unsigned int ch) {
     return(xmlIsBlankQ(ch));
 }
 
 
 /**
- * xmlIsChar:
+ * nl_xmlIsChar:
  * @ch:  character to validate
  *
  * This function is DEPRECATED.
@@ -253,13 +253,13 @@ xmlIsBlank(unsigned int ch) {
  * Returns true if argument valid, false otherwise
  */
 int
-xmlIsChar(unsigned int ch) {
+nl_xmlIsChar(unsigned int ch) {
     return(xmlIsCharQ(ch));
 }
 
 
 /**
- * xmlIsCombining:
+ * nl_xmlIsCombining:
  * @ch:  character to validate
  *
  * This function is DEPRECATED.
@@ -268,13 +268,13 @@ xmlIsChar(unsigned int ch) {
  * Returns true if argument valid, false otherwise
  */
 int
-xmlIsCombining(unsigned int ch) {
+nl_xmlIsCombining(unsigned int ch) {
     return(xmlIsCombiningQ(ch));
 }
 
 
 /**
- * xmlIsDigit:
+ * nl_xmlIsDigit:
  * @ch:  character to validate
  *
  * This function is DEPRECATED.
@@ -283,13 +283,13 @@ xmlIsCombining(unsigned int ch) {
  * Returns true if argument valid, false otherwise
  */
 int
-xmlIsDigit(unsigned int ch) {
+nl_xmlIsDigit(unsigned int ch) {
     return(xmlIsDigitQ(ch));
 }
 
 
 /**
- * xmlIsExtender:
+ * nl_xmlIsExtender:
  * @ch:  character to validate
  *
  * This function is DEPRECATED.
@@ -298,13 +298,13 @@ xmlIsDigit(unsigned int ch) {
  * Returns true if argument valid, false otherwise
  */
 int
-xmlIsExtender(unsigned int ch) {
+nl_xmlIsExtender(unsigned int ch) {
     return(xmlIsExtenderQ(ch));
 }
 
 
 /**
- * xmlIsIdeographic:
+ * nl_xmlIsIdeographic:
  * @ch:  character to validate
  *
  * This function is DEPRECATED.
@@ -313,13 +313,13 @@ xmlIsExtender(unsigned int ch) {
  * Returns true if argument valid, false otherwise
  */
 int
-xmlIsIdeographic(unsigned int ch) {
+nl_xmlIsIdeographic(unsigned int ch) {
     return(xmlIsIdeographicQ(ch));
 }
 
 
 /**
- * xmlIsPubidChar:
+ * nl_xmlIsPubidChar:
  * @ch:  character to validate
  *
  * This function is DEPRECATED.
@@ -328,7 +328,7 @@ xmlIsIdeographic(unsigned int ch) {
  * Returns true if argument valid, false otherwise
  */
 int
-xmlIsPubidChar(unsigned int ch) {
+nl_xmlIsPubidChar(unsigned int ch) {
     return(xmlIsPubidCharQ(ch));
 }