[PATCH 04/43] 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(a)redhat.com>
---
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;
--
2.37.3