From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 4 Oct 2022 14:09:20 +0000 (+0200)
Subject: util: xml: Use consistent naming for RNG validation error handling functions
X-Git-Tag: v8.10.0-rc1~261
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=426a0b37794b9ee77c8b038923108e18478cf7fd;p=thirdparty%2Flibvirt.git

util: xml: Use consistent naming for RNG validation error handling functions

Rename 'catchRNGError' to 'virXMLValidatorRNGErrorCatch' and
'ignoreRNGError' to 'virXMLValidatorRNGErrorIgnore'.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/util/virxml.c b/src/util/virxml.c
index 43b1ccfd24..16e7ef9808 100644
--- a/src/util/virxml.c
+++ b/src/util/virxml.c
@@ -1608,9 +1608,9 @@ virXMLNodeSanitizeNamespaces(xmlNodePtr node)
 
 
 static void
-catchRNGError(void *ctx,
-              const char *msg,
-              ...)
+virXMLValidatorRNGErrorCatch(void *ctx,
+                             const char *msg,
+                             ...)
 {
     virBuffer *buf = ctx;
     va_list args;
@@ -1624,9 +1624,9 @@ catchRNGError(void *ctx,
 
 
 static void
-ignoreRNGError(void *ctx G_GNUC_UNUSED,
-               const char *msg G_GNUC_UNUSED,
-               ...)
+virXMLValidatorRNGErrorIgnore(void *ctx G_GNUC_UNUSED,
+                              const char *msg G_GNUC_UNUSED,
+                              ...)
 {}
 
 
@@ -1648,8 +1648,8 @@ virXMLValidatorInit(const char *schemafile)
     }
 
     xmlRelaxNGSetParserErrors(validator->rngParser,
-                              catchRNGError,
-                              ignoreRNGError,
+                              virXMLValidatorRNGErrorCatch,
+                              virXMLValidatorRNGErrorIgnore,
                               &validator->buf);
 
     if (!(validator->rng = xmlRelaxNGParse(validator->rngParser))) {
@@ -1668,8 +1668,8 @@ virXMLValidatorInit(const char *schemafile)
     }
 
     xmlRelaxNGSetValidErrors(validator->rngValid,
-                             catchRNGError,
-                             ignoreRNGError,
+                             virXMLValidatorRNGErrorCatch,
+                             virXMLValidatorRNGErrorIgnore,
                              &validator->buf);
     return validator;