misc: adjust to structured error callback argument change in libxml2 2.12 (#86080)
gitea/lasso/pipeline/head This commit looks good
Details
gitea/lasso/pipeline/head This commit looks good
Details
This commit is contained in:
parent
9767cdf764
commit
cbe2c45455
2
NEWS
2
NEWS
|
@ -9,6 +9,8 @@ Future
|
||||||
- Annotate lasso_*_signature_method functions with LASSO_EXPORT (#86076)
|
- Annotate lasso_*_signature_method functions with LASSO_EXPORT (#86076)
|
||||||
- Fix implicit function declaration errors, patch provided by Rob Crittenden
|
- Fix implicit function declaration errors, patch provided by Rob Crittenden
|
||||||
from RedHat (#85340)
|
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
|
2.8.2 - March 14th 2023
|
||||||
-----------------------
|
-----------------------
|
||||||
|
|
|
@ -138,7 +138,13 @@ DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
|
||||||
#include "types.c"
|
#include "types.c"
|
||||||
|
|
||||||
static void
|
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);
|
g_log("libxml2", G_LOG_LEVEL_DEBUG, "libxml2: %s", error->message);
|
||||||
}
|
}
|
||||||
|
|
|
@ -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;
|
*(int*)userData = error->code;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue