mirror of
https://github.com/systemd/systemd.git
synced 2024-10-27 01:55:22 +03:00
nspawn: fix misplaced parenthesis and merge two error handling paths
I don't think we need to provide the two separate error messages, let's shorten the code a bit by merging them. Coverity CID#1402320.
This commit is contained in:
parent
622ecfa869
commit
fa8b675ae0
@ -2092,13 +2092,9 @@ static int oci_hook_timeout(const char *name, JsonVariant *v, JsonDispatchFlags
|
||||
uintmax_t k;
|
||||
|
||||
k = json_variant_unsigned(v);
|
||||
if (k == 0)
|
||||
return json_log(v, flags, SYNTHETIC_ERRNO(EINVAL),
|
||||
"Hook timeout cannot be zero.");
|
||||
|
||||
if (k > (UINT64_MAX-1/USEC_PER_SEC))
|
||||
return json_log(v, flags, SYNTHETIC_ERRNO(EINVAL),
|
||||
"Hook timeout too large.");
|
||||
if (k == 0 || k > (UINT64_MAX-1)/USEC_PER_SEC)
|
||||
return json_log(v, flags, SYNTHETIC_ERRNO(ERANGE),
|
||||
"Hook timeout value out of range.");
|
||||
|
||||
*u = k * USEC_PER_SEC;
|
||||
return 0;
|
||||
|
Loading…
Reference in New Issue
Block a user