From: Martin Kletzander <mkletzan@redhat.com>
Date: Wed, 5 Jan 2022 13:05:58 +0000 (+0100)
Subject: util: Improve log output parsing errors
X-Git-Tag: v8.0.0-rc1~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bfe7cd3d8aab99c10852ee0838e27b1f08fe6ba8;p=thirdparty%2Flibvirt.git

util: Improve log output parsing errors

Suggested-by: Erik Skultety <eskultet@redhat.com>
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
---

diff --git a/src/util/virlog.c b/src/util/virlog.c
index 139dce8d02..b44ad0ef6c 100644
--- a/src/util/virlog.c
+++ b/src/util/virlog.c
@@ -1487,21 +1487,21 @@ virLogParseOutput(const char *src)
     if (!(tokens = g_strsplit(src, ":", 0)) ||
         (count = g_strv_length(tokens)) < 2) {
         virReportError(VIR_ERR_INVALID_ARG,
-                       _("Malformed format for output '%s'"), src);
+                       _("Malformed format for log output '%s'"), src);
         return NULL;
     }
 
     if (virStrToLong_uip(tokens[0], NULL, 10, &prio) < 0 ||
         (prio < VIR_LOG_DEBUG) || (prio > VIR_LOG_ERROR)) {
         virReportError(VIR_ERR_INVALID_ARG,
-                       _("Invalid priority '%s' for output '%s'"),
+                       _("Invalid log priority '%s' for log output '%s'"),
                        tokens[0], src);
         return NULL;
     }
 
     if ((dest = virLogDestinationTypeFromString(tokens[1])) < 0) {
         virReportError(VIR_ERR_INVALID_ARG,
-                       _("Invalid destination '%s' for output '%s'"),
+                       _("Invalid log destination '%s' for log output '%s'"),
                        tokens[1], src);
         return NULL;
     }
@@ -1511,7 +1511,7 @@ virLogParseOutput(const char *src)
         ((dest == VIR_LOG_TO_FILE ||
           dest == VIR_LOG_TO_SYSLOG) && count != 3)) {
         virReportError(VIR_ERR_INVALID_ARG,
-                       _("Output '%s' does not meet the format requirements "
+                       _("Log output '%s' does not meet the format requirements "
                          "for destination type '%s'"), src, tokens[1]);
         return NULL;
     }