From 426a0b37794b9ee77c8b038923108e18478cf7fd Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Tue, 4 Oct 2022 16:09:20 +0200 Subject: [PATCH] util: xml: Use consistent naming for RNG validation error handling functions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rename 'catchRNGError' to 'virXMLValidatorRNGErrorCatch' and 'ignoreRNGError' to 'virXMLValidatorRNGErrorIgnore'. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- src/util/virxml.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) 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;