From: Bruno Haible Date: Mon, 11 Aug 2025 14:54:20 +0000 (+0200) Subject: its: Fix error handling. X-Git-Tag: v1.0~100 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6836b4362407d9f1958044102c3806904a1ba29b;p=thirdparty%2Fgettext.git its: Fix error handling. * gettext-tools/src/its.c (structured_error, its_rule_list_add_from_file, its_rule_list_add_from_string, its_rule_list_extract, its_merge_context_alloc): Swap error() arguments. --- diff --git a/gettext-tools/src/its.c b/gettext-tools/src/its.c index cbe400e52..bfa9c99cb 100644 --- a/gettext-tools/src/its.c +++ b/gettext-tools/src/its.c @@ -90,7 +90,7 @@ structured_error (void *data, const xmlError *err) structured_error (void *data, xmlError *err) #endif { - error (0, err->level == XML_ERR_FATAL ? EXIT_FAILURE : 0, + error (err->level == XML_ERR_FATAL ? EXIT_FAILURE : 0, 0, _("%s error: %s"), "libxml2", err->message); } @@ -1598,7 +1598,7 @@ its_rule_list_add_from_file (struct its_rule_list_ty *rules, if (doc == NULL) { const xmlError *err = xmlGetLastError (); - error (0, err->level == XML_ERR_FATAL ? EXIT_FAILURE : 0, + error (err->level == XML_ERR_FATAL ? EXIT_FAILURE : 0, 0, _("cannot read %s: %s"), filename, err->message); return false; } @@ -1629,7 +1629,7 @@ its_rule_list_add_from_string (struct its_rule_list_ty *rules, if (doc == NULL) { const xmlError *err = xmlGetLastError (); - error (0, err->level == XML_ERR_FATAL ? EXIT_FAILURE : 0, + error (err->level == XML_ERR_FATAL ? EXIT_FAILURE : 0, 0, _("cannot read %s: %s"), "(internal)", err->message); return false; } @@ -2042,7 +2042,7 @@ its_rule_list_extract (its_rule_list_ty *rules, if (doc == NULL) { const xmlError *err = xmlGetLastError (); - error (0, err->level == XML_ERR_FATAL ? EXIT_FAILURE : 0, + error (err->level == XML_ERR_FATAL ? EXIT_FAILURE : 0, 0, _("cannot read %s: %s"), logical_filename, err->message); return; } @@ -3052,7 +3052,7 @@ its_merge_context_alloc (its_rule_list_ty *rules, if (doc == NULL) { const xmlError *err = xmlGetLastError (); - error (0, err->level == XML_ERR_FATAL ? EXIT_FAILURE : 0, + error (err->level == XML_ERR_FATAL ? EXIT_FAILURE : 0, 0, _("cannot read %s: %s"), filename, err->message); return NULL; }