SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tree-wide: propagate error code from _from_string() functions

Browse Source 
Now that we know we have something useful, no need to make an answer up.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2021-02-10 14:46:59 +01:00
parent 751db3b4cd
commit 7211c853c2
27 changed files with 62 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nspawn/nspawn-oci.c
+1 -1
View File
@@ -205,7 +205,7 @@ static int oci_rlimit_type(const char *name, JsonVariant *v, JsonDispatchFlags f
t = rlimit_from_string(z);
if (t < 0)
return json_log(v, flags, SYNTHETIC_ERRNO(EINVAL),
return json_log(v, flags, t,
"rlimit name unknown: %s", json_variant_string(v));
*type = t;
src/nspawn/nspawn.c
+4 -6
View File
@@ -1280,8 +1280,7 @@ static int parse_argv(int argc, char *argv[]) {
arg_kill_signal = signal_from_string(optarg);
if (arg_kill_signal < 0)
return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
"Cannot parse signal: %s", optarg);
return log_error_errno(arg_kill_signal, "Cannot parse signal: %s", optarg);
arg_settings_mask |= SETTING_KILL_SIGNAL;
break;
@@ -1443,8 +1442,7 @@ static int parse_argv(int argc, char *argv[]) {
rl = rlimit_from_string_harder(name);
if (rl < 0)
return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
"Unknown resource limit: %s", name);
return log_error_errno(rl, "Unknown resource limit: %s", name);
if (!arg_rlimit[rl]) {
arg_rlimit[rl] = new0(struct rlimit, 1);
@@ -1490,7 +1488,7 @@ static int parse_argv(int argc, char *argv[]) {
arg_resolv_conf = resolv_conf_mode_from_string(optarg);
if (arg_resolv_conf < 0)
return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
return log_error_errno(arg_resolv_conf,
"Failed to parse /etc/resolv.conf mode: %s", optarg);
arg_settings_mask |= SETTING_RESOLV_CONF;
@@ -1504,7 +1502,7 @@ static int parse_argv(int argc, char *argv[]) {
arg_timezone = timezone_mode_from_string(optarg);
if (arg_timezone < 0)
return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
return log_error_errno(arg_timezone,
"Failed to parse /etc/localtime mode: %s", optarg);
arg_settings_mask |= SETTING_TIMEZONE;