picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

nspawn: fix misplaced parenthesis and merge two error handling paths

Browse source 
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:
Zbigniew Jędrzejewski-Szmek 2019-07-17 10:14:34 +02:00
parent 622ecfa869
commit fa8b675ae0
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/nspawn/nspawn-oci.c
View file

@ -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;