X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Futils%2Fxml-utils%2Fvalidate_xml.cpp;fp=tests%2Futils%2Fxml-utils%2Fvalidate_xml.cpp;h=aa2d526bd9096fccd590bb4234eb802a99bfeca9;hb=28ab034a2c3582d07d3423d2d746731f87d3969f;hp=887f7af524c146a2f1f6d8b5ecd2ee018cc981c3;hpb=52e345b9ac912d033c2a2c25a170a01cf209839d;p=lttng-tools.git diff --git a/tests/utils/xml-utils/validate_xml.cpp b/tests/utils/xml-utils/validate_xml.cpp index 887f7af52..aa2d526bd 100644 --- a/tests/utils/xml-utils/validate_xml.cpp +++ b/tests/utils/xml-utils/validate_xml.cpp @@ -5,27 +5,27 @@ * */ - /* - * This script validate and xml from an xsd. - * argv[1] Path of the xsd - * argv[2] Path to the XML to be validated - */ +/* + * This script validate and xml from an xsd. + * argv[1] Path of the xsd + * argv[2] Path to the XML to be validated + */ + +#include + +#include #include +#include +#include +#include +#include #include #include #include -#include -#include -#include -#include #include - -#include -#include - -#include -#include +#include +#include namespace { struct validation_ctx { @@ -35,14 +35,11 @@ struct validation_ctx { }; } /* namespace */ -enum command_err_code { - CMD_SUCCESS = 0, - CMD_ERROR -}; +enum command_err_code { CMD_SUCCESS = 0, CMD_ERROR }; -static ATTR_FORMAT_PRINTF(2, 3) -void xml_error_handler(void *ctx __attribute__((unused)), - const char *format, ...) +static ATTR_FORMAT_PRINTF(2, 3) void xml_error_handler(void *ctx __attribute__((unused)), + const char *format, + ...) { char *err_msg; va_list args; @@ -52,8 +49,7 @@ void xml_error_handler(void *ctx __attribute__((unused)), ret = vasprintf(&err_msg, format, args); va_end(args); if (ret == -1) { - fprintf(stderr, "ERR: %s\n", - "String allocation failed in xml error handle"); + fprintf(stderr, "ERR: %s\n", "String allocation failed in xml error handle"); return; } @@ -61,9 +57,7 @@ void xml_error_handler(void *ctx __attribute__((unused)), free(err_msg); } -static -void fini_validation_ctx( - struct validation_ctx *ctx) +static void fini_validation_ctx(struct validation_ctx *ctx) { if (ctx->parser_ctx) { xmlSchemaFreeParserCtxt(ctx->parser_ctx); @@ -80,9 +74,7 @@ void fini_validation_ctx( memset(ctx, 0, sizeof(struct validation_ctx)); } -static -int init_validation_ctx( - struct validation_ctx *ctx, char *xsd_path) +static int init_validation_ctx(struct validation_ctx *ctx, char *xsd_path) { int ret; @@ -96,8 +88,7 @@ int init_validation_ctx( ret = -LTTNG_ERR_LOAD_INVALID_CONFIG; goto end; } - xmlSchemaSetParserErrors(ctx->parser_ctx, xml_error_handler, - xml_error_handler, NULL); + xmlSchemaSetParserErrors(ctx->parser_ctx, xml_error_handler, xml_error_handler, NULL); ctx->schema = xmlSchemaParse(ctx->parser_ctx); if (!ctx->schema) { @@ -111,8 +102,8 @@ int init_validation_ctx( goto end; } - xmlSchemaSetValidErrors(ctx->schema_validation_ctx, xml_error_handler, - xml_error_handler, NULL); + xmlSchemaSetValidErrors( + ctx->schema_validation_ctx, xml_error_handler, xml_error_handler, NULL); ret = 0; end: