From 34378a4ac257f2f5fcf364786d1634a8c36b304f Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Mon, 27 Nov 2023 15:04:43 +0100 Subject: [PATCH 1/2] Make xmlError structs constant In libxml2 commits v2.12.0~14 and v2.12.0~77 the API changed so that: 1) xmlGetLastError() returns pointer to a constant xmlError struct, and 2) xmlSetStructuredErrorFunc() changed the signature of callback (validate_structured_error_nop()), it too is passed pointer to a constant xmlError struct. But of course, older libxml2 expects different callback signature. Therefore, we need to typecast it anyway. Also, drop obviously incorrect @error annotation in validate_structured_error_nop; the variable is used. Signed-off-by: Michal Privoznik --- tools/osinfo-db-validate.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/osinfo-db-validate.c b/tools/osinfo-db-validate.c index a721b4d..b1434a6 100644 --- a/tools/osinfo-db-validate.c +++ b/tools/osinfo-db-validate.c @@ -35,7 +35,7 @@ static void validate_generic_error_nop(void *userData G_GNUC_UNUSED, } static void validate_structured_error_nop(void *userData G_GNUC_UNUSED, - xmlErrorPtr error G_GNUC_UNUSED) + const xmlError *error) { if (error->file) g_printerr("%s:%d %s", error->file, error->line, error->message); @@ -173,7 +173,8 @@ static gboolean validate_files(GFile *schema, gsize nfiles, GFile **files, GErro g_autofree gchar *schemapath = NULL; xmlSetGenericErrorFunc(NULL, validate_generic_error_nop); - xmlSetStructuredErrorFunc(NULL, validate_structured_error_nop); + /* Drop this typecast when >=libxml2-2.12.0 is required */ + xmlSetStructuredErrorFunc(NULL, (xmlStructuredErrorFunc) validate_structured_error_nop); schemapath = g_file_get_path(schema); rngParser = xmlRelaxNGNewParserCtxt(schemapath); -- GitLab From 019487cbc79925e49988789bf533c78dab7e1842 Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Mon, 27 Nov 2023 15:06:04 +0100 Subject: [PATCH 2/2] osinfo-db-validate: Add more libxml/ includes In its 2.12.0 release, libxml reworked their header files (some might even call it cleaning up, I call it API incompatible change) and now we don't get all declarations we need by just including one file. Add missing includes. Signed-off-by: Michal Privoznik --- tools/osinfo-db-validate.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/osinfo-db-validate.c b/tools/osinfo-db-validate.c index b1434a6..f3275db 100644 --- a/tools/osinfo-db-validate.c +++ b/tools/osinfo-db-validate.c @@ -20,7 +20,9 @@ * Daniel P. Berrange */ +#include #include +#include #include #include -- GitLab