Deprecate rather than remove call to xmlGetLastError()

libxml-raku · Jun 1, 2024 · 266f3bf · 266f3bf
1 parent 7ff8e5b
commit 266f3bf
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 7 deletions.
diff --git a/lib/LibXML/InputCallback.rakumod b/lib/LibXML/InputCallback.rakumod
@@ -350,7 +350,6 @@ method activate {
 
 method deactivate {
     for @!callbacks {
-        note "-";
         warn "unable to remove input callbacks"
             if xmlInputCallbacks::Pop() < 0;
     }

diff --git a/src/xml6_gbl.c b/src/xml6_gbl.c
@@ -78,7 +78,6 @@ DLLEXPORT void xml6_gbl_os_thread_xml_free(void* obj) {
     xmlFree(obj);
 }
 
-#ifdef XML6_GBL_COMPAT_OLD_ERRORS
 struct _xml6HandlerSave {
     void* serror_ctxt;
     xmlStructuredErrorFunc serror_handler;
@@ -90,7 +89,26 @@ typedef struct _xml6HandlerSave xml6HandlerSave;
 typedef xml6HandlerSave *xml6HandlerSavePtr;
 
 DLLEXPORT xmlError* xml6_gbl_os_thread_get_last_error(void) {
+#ifdef XML6_GBL_COMPAT_OLD_ERRORS
     return &xmlLastError;
+#else
+    static xmlError e_deprecated = {
+        XML_FROM_NONE, /* domain */
+        XML_ERR_INTERNAL_ERROR, /* code */
+        "xmlLastError() is deprecated", /* message */
+        XML_ERR_FATAL, /* level */
+        NULL, /* file */
+        0, /* line */
+        NULL, /* str1 */
+        NULL, /* str2 */
+        NULL, /* str3 */
+        0, /* int1 */
+        0, /* int2 */
+        NULL, /* ctxt */
+        NULL  /* node */
+    };
+    return &e_deprecated;
+#endif
 }
 DLLEXPORT void* xml6_gbl_save_error_handlers(void) {
     xml6HandlerSavePtr save = (xml6HandlerSavePtr)xmlMalloc(sizeof(struct _xml6HandlerSave));
@@ -138,8 +156,6 @@ DLLEXPORT void xml6_gbl_set_generic_error_handler(xml6_gbl_MessageCallback callb
     setter(ctx, handler);
 }
 
-#endif
-
 static xmlSAXLocator _default_sax_locator = {
     xmlSAX2GetPublicId,
     xmlSAX2GetSystemId,

diff --git a/src/xml6_gbl.h b/src/xml6_gbl.h
@@ -4,7 +4,7 @@
 #include <libxml/globals.h>
 #include <libxml/xmlversion.h>
 
-#if LIBXML_VERSION < 21301
+#if LIBXML_VERSION < 21300
 # define XML6_GBL_COMPAT_OLD_ERRORS 1
 #endif
 
@@ -23,13 +23,11 @@ DLLEXPORT void xml6_gbl_os_thread_set_keep_blanks(int flag);
 
 DLLEXPORT void xml6_gbl_os_thread_xml_free(void*);
 
-#ifdef XML6_GBL_COMPAT_OLD_ERRORS
 typedef void (*xml6_gbl_MessageCallback) (const char *msg);
 DLLEXPORT xmlError* xml6_gbl_os_thread_get_last_error(void);
 DLLEXPORT void* xml6_gbl_save_error_handlers(void);
 DLLEXPORT void xml6_gbl_restore_error_handlers(void*);
 DLLEXPORT void xml6_gbl_set_generic_error_handler(xml6_gbl_MessageCallback, void (*route)(void*, xmlGenericErrorFunc));
-#endif
 
 DLLEXPORT xmlSAXLocatorPtr xml6_gbl_os_thread_get_default_sax_locator(void);