xpath: Make init function private

include/private/Makefile.am

@@ -14,4 +14,5 @@ EXTRA_DIST = \
 	string.h \
 	threads.h \
 	tree.h \
+	xpath.h \
 	xzlib.h

include/private/xpath.h

@@ -0,0 +1,6 @@
+#ifndef XML_XPATH_H_PRIVATE__
+#define XML_XPATH_H_PRIVATE__
+
+void xmlInitXPathInternal(void);
+
+#endif /* XML_XPATH_H_PRIVATE__ */

parser.c

@@ -85,6 +85,7 @@
 #include "private/memory.h"
 #include "private/parser.h"
 #include "private/threads.h"
+#include "private/xpath.h"
 
 struct _xmlStartTag {
     const xmlChar *prefix;
@@ -14509,7 +14510,7 @@ xmlInitParser(void) {
 	xmlRegisterDefaultOutputCallbacks();
 #endif /* LIBXML_OUTPUT_ENABLED */
 #if defined(LIBXML_XPATH_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
-	xmlXPathInit();
+	xmlInitXPathInternal();
 #endif
 	xmlParserInitialized = 1;
 #ifdef LIBXML_THREAD_ENABLED

xpath.c

@@ -51,6 +51,7 @@
 
 #include "private/buf.h"
 #include "private/error.h"
+#include "private/xpath.h"
 
 #ifdef LIBXML_PATTERN_ENABLED
 #define XPATH_STREAMING
@@ -486,14 +487,21 @@ double xmlXPathNINF = 0.0;
 /**
  * xmlXPathInit:
  *
- * DEPRECATED: This function will be made private. Call xmlInitParser to
- * initialize the library.
+ * DEPRECATED: Alias for xmlInitParser.
+ */
+void
+xmlXPathInit(void) {
+    xmlInitParser();
+}
+
+/**
+ * xmlInitXPathInternal:
  *
  * Initialize the XPath environment
  */
 ATTRIBUTE_NO_SANITIZE("float-divide-by-zero")
 void
-xmlXPathInit(void) {
+xmlInitXPathInternal(void) {
 #if defined(NAN) && defined(INFINITY)
     xmlXPathNAN = NAN;
     xmlXPathPINF = INFINITY;