From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 12 Oct 2023 13:07:07 +0000 (+0200)
Subject: varlinkctl: generate slightly more useful error messages
X-Git-Tag: v255-rc1~255
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=76641edfa227b8ff9ce52357d5681fd6ec90e250;p=thirdparty%2Fsystemd.git

varlinkctl: generate slightly more useful error messages
---

diff --git a/src/varlinkctl/varlinkctl.c b/src/varlinkctl/varlinkctl.c
index a656bfcaf00..33c85b87ff3 100644
--- a/src/varlinkctl/varlinkctl.c
+++ b/src/varlinkctl/varlinkctl.c
@@ -475,12 +475,20 @@ static int verb_validate_idl(int argc, char *argv[], void *userdata) {
         }
 
         r = varlink_idl_parse(text, &line, &column, &vi);
+        if (r == -EBADMSG)
+                return log_error_errno(r, "%s:%u:%u: Bad syntax.", fname, line, column);
+        if (r == -ENETUNREACH)
+                return log_error_errno(r, "%s:%u:%u: Failed to parse interface description due an unresolved type.", fname, line, column);
         if (r < 0)
                 return log_error_errno(r, "%s:%u:%u: Failed to parse interface description: %m", fname, line, column);
 
         r = varlink_idl_consistent(vi, LOG_ERR);
+        if (r == -EUCLEAN)
+                return log_error_errno(r, "Interface is inconsistent.");
+        if (r == -ENOTUNIQ)
+                return log_error_errno(r, "Field or symbol not unique in interface.");
         if (r < 0)
-                return r;
+                return log_error_errno(r, "Failed to check interface for consistency: %m");
 
         pager_open(arg_pager_flags);