From cbe2c45455d93ed793dc4be59e3d2d26f1bd1111 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Wed, 24 Jan 2024 15:15:39 +0100 Subject: [PATCH] misc: adjust to structured error callback argument change in libxml2 2.12 (#86080) --- NEWS | 2 ++ lasso/lasso.c | 8 +++++++- lasso/xml/tools.c | 9 ++++++++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 63e609f7..cc0c3d92 100644 --- a/NEWS +++ b/NEWS @@ -9,6 +9,8 @@ Future - Annotate lasso_*_signature_method functions with LASSO_EXPORT (#86076) - Fix implicit function declaration errors, patch provided by Rob Crittenden from RedHat (#85340) +- Adjust to structured error callback argument change in libxml2 2.12, patch + provided by Florian Wiemer of RedHat (#86080) 2.8.2 - March 14th 2023 ----------------------- diff --git a/lasso/lasso.c b/lasso/lasso.c index 42b7d6bb..bc75f5e6 100644 --- a/lasso/lasso.c +++ b/lasso/lasso.c @@ -138,7 +138,13 @@ DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) #include "types.c" static void -lasso_xml_structured_error_func(G_GNUC_UNUSED void *user_data, xmlErrorPtr error) +lasso_xml_structured_error_func(G_GNUC_UNUSED void *user_data, +#if LIBXML_VERSION >= 21200 + const xmlError *error +#else + xmlErrorPtr error +#endif + ) { g_log("libxml2", G_LOG_LEVEL_DEBUG, "libxml2: %s", error->message); } diff --git a/lasso/xml/tools.c b/lasso/xml/tools.c index bbc87d9f..4d5fa78a 100644 --- a/lasso/xml/tools.c +++ b/lasso/xml/tools.c @@ -1450,7 +1450,14 @@ lasso_concat_url_query(const char *url, const char *query) } } -static void structuredErrorFunc (void *userData, xmlErrorPtr error) { +static void structuredErrorFunc (void *userData, +#if LIBXML_VERSION >= 21200 + const xmlError *error +#else + xmlErrorPtr error +#endif + ) +{ *(int*)userData = error->code; }