Date: Tue, 10 Jan 2023 19:20:56 GMT From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= <des@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: d5c85ac6526d - main - tzcode: Address some compiler warnings. Message-ID: <202301101920.30AJKu1f063071@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=d5c85ac6526dcd0ac25ebdb71969c8c788d5e13b commit d5c85ac6526dcd0ac25ebdb71969c8c788d5e13b Author: Dag-Erling Smørgrav <des@FreeBSD.org> AuthorDate: 2023-01-10 19:20:11 +0000 Commit: Dag-Erling Smørgrav <des@FreeBSD.org> 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 <pwd.h> 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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202301101920.30AJKu1f063071>