From fa8b675ae0c341daa141cce8783c106e048045e1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 17 Jul 2019 10:14:34 +0200 Subject: [PATCH] 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. --- src/nspawn/nspawn-oci.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/nspawn/nspawn-oci.c b/src/nspawn/nspawn-oci.c index ef67731..4519c74 100644 --- a/src/nspawn/nspawn-oci.c +++ b/src/nspawn/nspawn-oci.c @@ -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; -- 2.7.4