From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Sun, 14 May 2023 12:16:44 +0000 (+0200)
Subject: nspawn: simplify error handling
X-Git-Tag: v254-rc1~484^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fee9f7b5c70477bb96c61cce8b542e4148f896cd;p=thirdparty%2Fsystemd.git

nspawn: simplify error handling
---

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 9e5b7772ac2..49802d6fdfb 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -877,17 +877,15 @@ static int parse_argv(int argc, char *argv[]) {
                         break;
 
                 case ARG_NETWORK_ZONE: {
-                        char *j;
+                        _cleanup_free_ char *j = NULL;
 
                         j = strjoin("vz-", optarg);
                         if (!j)
                                 return log_oom();
 
-                        if (!ifname_valid(j)) {
-                                log_error("Network zone name not valid: %s", j);
-                                free(j);
-                                return -EINVAL;
-                        }
+                        if (!ifname_valid(j))
+                                return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+                                                       "Network zone name not valid: %s", j);
 
                         free_and_replace(arg_network_zone, j);