Développement #86080
Adjust to structured error callback argument change in libxml2 2.12
Start date:
24 January 2024
Due date:
% Done:
0%
Estimated time:
Patch proposed:
No
Planning:
No
Description
Patch provided on the mailing list by Florian Weimer of RedHat.
diff --git a/lasso/lasso.c b/lasso/lasso.c index 42b7d6bb2392525e..bc75f5e674b5e657 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 bbc87d9f1e7eb20d..4d5fa78a28222f1a 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;
Associated revisions
History
Updated by Robot Gitea 11 months ago
- Status changed from Nouveau to Solution proposée
Benjamin Dauvergne (bdauvergne) a ouvert une pull request sur Gitea concernant cette demande :
- URL : https://git.entrouvert.org/entrouvert/lasso/pulls/9
- Titre : misc: adjust to structured error callback argument change in libxml2 2.12 (#86080)
- Modifications : https://git.entrouvert.org/entrouvert/lasso/pulls/9/files
Updated by Robot Gitea 11 months ago
- Status changed from Solution proposée to Résolu (à déployer)
Benjamin Dauvergne (bdauvergne) a mergé une pull request sur Gitea concernant cette demande :
- URL : https://git.entrouvert.org/entrouvert/lasso/pulls/9
- Titre : misc: adjust to structured error callback argument change in libxml2 2.12 (#86080)
- Modifications : https://git.entrouvert.org/entrouvert/lasso/pulls/9/files
misc: adjust to structured error callback argument change in libxml2 2.12 (#86080)