]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
confile: cleanup set_config_ephemeral()
authorChristian Brauner <christian.brauner@ubuntu.com>
Tue, 8 Dec 2020 16:14:13 +0000 (17:14 +0100)
committerChristian Brauner <christian.brauner@ubuntu.com>
Tue, 8 Dec 2020 16:14:13 +0000 (17:14 +0100)
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
src/lxc/confile.c

index a6efe0b74084327ba08da22e3a7946d6682d86b6..79793242378eb128c1375b55a52797e73f30155f 100644 (file)
@@ -3440,16 +3440,19 @@ bool network_new_hwaddrs(struct lxc_conf *conf)
 static int set_config_ephemeral(const char *key, const char *value,
                                struct lxc_conf *lxc_conf, void *data)
 {
+       int ret;
+
        if (lxc_config_value_empty(value)) {
                lxc_conf->ephemeral = 0;
                return 0;
        }
 
-       if (lxc_safe_uint(value, &lxc_conf->ephemeral) < 0)
-               return -1;
+       ret = lxc_safe_uint(value, &lxc_conf->ephemeral);
+       if (ret < 0)
+               return ret;
 
        if (lxc_conf->ephemeral > 1)
-               return -1;
+               return ret_errno(EINVAL);
 
        return 0;
 }