From nobody Tue Jan 10 19:20:56 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ns0yw6ZBpz2p2Pf; Tue, 10 Jan 2023 19:20:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ns0yw68Psz4JLQ; Tue, 10 Jan 2023 19:20:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673378456; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/bRVvuCNg1h76Flw8MhFtQWcEvu6Z0OvYvyiZ0yBe1A=; b=tg1LWORyC+1ICLwmmHjHGa6Scm+GPVLC4bKebL8CukrKJmxV/l+tEQrTPNxITurGTvNZRg gI5ADwaIs4C/V2Kkp8Hd4gnkPDqqw5zTqGtoYDY2hMVUs4eOmbIgIPW3O2KPzp1CTyeXfk WznmhzYOxPHb3PtlMvj0shr4ZxLgdEftEPCjRqVPJ0KSZK1pXXFmQ0MoRRQTQdAUigeIa+ byCXzwe+KxhbMDs88hX70w9gIlaTH7ujyAAdgI9K8jX18un+GaAU6Cegjsvy2gCPiR7jJB B/x+2PI4jrl4wGcBR9rGH+kuckXAfLLVNKhmD/v6hhzjRWpq96p8vkM33GNU0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673378456; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/bRVvuCNg1h76Flw8MhFtQWcEvu6Z0OvYvyiZ0yBe1A=; b=wdn3aIp4+30zbAfb56lCAEh3IXwbHewrE2klmRhdL4Ad0WEF0TpP3mO06MBnXzDGX63VtQ 7ZpGuKXJXJdYWr9KcDIoJbzxqH76Q6ANbTRKTlLDf9fkmbpYpUbk9Ryzh+eRTvMkb3J9Sx oPDdtO+KPgadcwD2TE3y9UhVPHlpiRGvyjh7FDdaUsdc4eBC02NhrtOfWR+qVId7lN7hXc dPhokF8am6kIdMMRrd+ZaldahNNoX/J3pN584q/McN3lTdEE/x1y5YcYoePxsgX7BpJHyU J84HRX9H9/Df4rJu6zlI4O1tkV00ZoOgeP2qKItxD7akTLaqScTKkx/L2WArpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673378456; a=rsa-sha256; cv=none; b=Amatcx+8AkLu0mKTepKTYsJCfZPFYEBfoXWFoo8LdcXrJOcw1+tuo7PjaLmF2NolKGlyEz tIB48ArKNSFUUdPYGpUAOSmkt+okD5hMiBoCJDkx+yfm+iGGDEVKGCx4+GcOZ9Z9UmFutl KAQBWaQj/uRri0g6RCwhM2SBtv9YFEeTkCVjMH30+NAFxQK4r6zMQbMY+FzojV+zlmHrsU 3EVjb/107M/3/0Sg+WIML1oY31AhaqGeAb/eauhUBNgq54khUeTFO47PpjST65LKwPjI9J ZUxSEI23YZnnElnWUlulJzN24LL4h6VjMz9wbB7rt68xNyO6w7ik2PbhnvlleQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ns0yw5C06zKKr; Tue, 10 Jan 2023 19:20:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30AJKuDU063072; Tue, 10 Jan 2023 19:20:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30AJKu1f063071; Tue, 10 Jan 2023 19:20:56 GMT (envelope-from git) Date: Tue, 10 Jan 2023 19:20:56 GMT Message-Id: <202301101920.30AJKu1f063071@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: d5c85ac6526d - main - tzcode: Address some compiler warnings. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d5c85ac6526dcd0ac25ebdb71969c8c788d5e13b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=d5c85ac6526dcd0ac25ebdb71969c8c788d5e13b commit d5c85ac6526dcd0ac25ebdb71969c8c788d5e13b Author: Dag-Erling Smørgrav AuthorDate: 2023-01-10 19:20:11 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-01-10 19:20:11 +0000 tzcode: Address some compiler warnings. MFC after: 1 week Sponsored by: Klara, Inc. --- contrib/tzcode/zdump.c | 9 ++++----- contrib/tzcode/zic.c | 39 ++++++++++++++++++--------------------- 2 files changed, 22 insertions(+), 26 deletions(-) diff --git a/contrib/tzcode/zdump.c b/contrib/tzcode/zdump.c index d5ddfe537960..e4ac81cc220c 100644 --- a/contrib/tzcode/zdump.c +++ b/contrib/tzcode/zdump.c @@ -134,16 +134,15 @@ size_overflow(void) /* Return A + B, exiting if the result would overflow either ptrdiff_t or size_t. */ -static ATTRIBUTE_REPRODUCIBLE ptrdiff_t +static ATTRIBUTE_REPRODUCIBLE size_t sumsize(size_t a, size_t b) { #ifdef ckd_add - ptrdiff_t sum; - if (!ckd_add(&sum, a, b) /* && sum <= SIZE_MAX */) + size_t sum; + if (!ckd_add(&sum, a, b)) return sum; #else - ptrdiff_t sum_max = min(PTRDIFF_MAX, SIZE_MAX); - if (a <= sum_max && b <= sum_max - a) + if (a <= SIZE_MAX && b <= SIZE_MAX - a) return a + b; #endif size_overflow(); diff --git a/contrib/tzcode/zic.c b/contrib/tzcode/zic.c index 3be46c8563d7..64937d9b0d36 100644 --- a/contrib/tzcode/zic.c +++ b/contrib/tzcode/zic.c @@ -474,40 +474,38 @@ size_overflow(void) memory_exhausted(_("size overflow")); } -static ATTRIBUTE_REPRODUCIBLE ptrdiff_t +static ATTRIBUTE_REPRODUCIBLE size_t size_sum(size_t a, size_t b) { #ifdef ckd_add - ptrdiff_t sum; - if (!ckd_add(&sum, a, b) /* && sum <= SIZE_MAX */) + size_t sum; + if (!ckd_add(&sum, a, b)) return sum; #else - ptrdiff_t sum_max = min(PTRDIFF_MAX, SIZE_MAX); - if (a <= sum_max && b <= sum_max - a) + if (b <= SIZE_MAX - a) return a + b; #endif size_overflow(); } -static ATTRIBUTE_REPRODUCIBLE ptrdiff_t -size_product(ptrdiff_t nitems, ptrdiff_t itemsize) +static ATTRIBUTE_REPRODUCIBLE size_t +size_product(size_t nitems, size_t itemsize) { #ifdef ckd_mul - ptrdiff_t product; - if (!ckd_mul(&product, nitems, itemsize) /* && product <= SIZE_MAX */) + size_t product; + if (!ckd_mul(&product, nitems, itemsize)) return product; #else - ptrdiff_t nitems_max = min(PTRDIFF_MAX, SIZE_MAX) / itemsize; - if (nitems <= nitems_max) + if (nitems <= SIZE_MAX / itemsize) return nitems * itemsize; #endif size_overflow(); } -static ATTRIBUTE_REPRODUCIBLE ptrdiff_t -align_to(ptrdiff_t size, ptrdiff_t alignment) +static ATTRIBUTE_REPRODUCIBLE size_t +align_to(size_t size, size_t alignment) { - ptrdiff_t lo_bits = alignment - 1, sum = size_sum(size, lo_bits); + size_t lo_bits = alignment - 1, sum = size_sum(size, lo_bits); return sum & ~lo_bits; } @@ -1269,7 +1267,10 @@ get_rand_u64(void) s = getrandom(entropy_buffer, sizeof entropy_buffer, 0); while (s < 0 && errno == EINTR); - nwords = s < 0 ? -1 : s / sizeof *entropy_buffer; + if (s < 0) + nwords = -1; + else + nwords = s / sizeof *entropy_buffer; } if (0 < nwords) return entropy_buffer[--nwords]; @@ -3991,9 +3992,7 @@ mkdirs(char const *argname, bool ancestors) #include static void -setgroup(flag, name) - gid_t *flag; - const char *name; +setgroup(gid_t *flag, const char *name) { struct group *gr; @@ -4019,9 +4018,7 @@ setgroup(flag, name) } static void -setuser(flag, name) - uid_t *flag; - const char *name; +setuser(uid_t *flag, const char *name) { struct passwd *pw;