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>
This commit is contained in:
Peter Krempa 2022-10-04 16:09:20 +02:00
parent 877654b879
commit 426a0b3779

View File

@ -1608,9 +1608,9 @@ virXMLNodeSanitizeNamespaces(xmlNodePtr node)
static void static void
catchRNGError(void *ctx, virXMLValidatorRNGErrorCatch(void *ctx,
const char *msg, const char *msg,
...) ...)
{ {
virBuffer *buf = ctx; virBuffer *buf = ctx;
va_list args; va_list args;
@ -1624,9 +1624,9 @@ catchRNGError(void *ctx,
static void static void
ignoreRNGError(void *ctx G_GNUC_UNUSED, virXMLValidatorRNGErrorIgnore(void *ctx G_GNUC_UNUSED,
const char *msg G_GNUC_UNUSED, const char *msg G_GNUC_UNUSED,
...) ...)
{} {}
@ -1648,8 +1648,8 @@ virXMLValidatorInit(const char *schemafile)
} }
xmlRelaxNGSetParserErrors(validator->rngParser, xmlRelaxNGSetParserErrors(validator->rngParser,
catchRNGError, virXMLValidatorRNGErrorCatch,
ignoreRNGError, virXMLValidatorRNGErrorIgnore,
&validator->buf); &validator->buf);
if (!(validator->rng = xmlRelaxNGParse(validator->rngParser))) { if (!(validator->rng = xmlRelaxNGParse(validator->rngParser))) {
@ -1668,8 +1668,8 @@ virXMLValidatorInit(const char *schemafile)
} }
xmlRelaxNGSetValidErrors(validator->rngValid, xmlRelaxNGSetValidErrors(validator->rngValid,
catchRNGError, virXMLValidatorRNGErrorCatch,
ignoreRNGError, virXMLValidatorRNGErrorIgnore,
&validator->buf); &validator->buf);
return validator; return validator;