From nobody Thu Jun 26 07:38:04 2025 X-Original-To: dev-commits-src-all@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 4bSVsT0XLSz60BxW; Thu, 26 Jun 2025 07:38:05 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bSVsS5XYdz4Ddf; Thu, 26 Jun 2025 07:38:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750923484; 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=6dAwRfIQ2p0U36vn1HdcwfnWQaPCo2dCTDIYbd7ifg8=; b=KWC6h7Eb0CThCMGBfUMpRFqLa6soL2y6/wg6Hu1g+es/q9dd1mpObFVJe4ftSZhCBxPrLf r8Obfztz5oXF/ge+FNopVrXLQ0fxFGCZ6TQ9aN/0Gzjm7oWWCAnvh1l2JMZRuZEXNT0DFF LoTx+FkHAsb+cEV80TZyndyrbv+JPh32oPx/UFIYep2WyUbO5AGsQnDgh18zCO3Fl1jUOy 8/pE6WO4FL/VHTyCj008s+ZWgysLrj+a3nWeqHhIekn5bW/zJOxJ98l7RwSOae3XpX8vyd 9654wqj460pd46eJZxB8Hi0+zPzdNMKbCcDy/dbirqQJWm7vgsv5PEuXPcE7Kw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750923484; 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=6dAwRfIQ2p0U36vn1HdcwfnWQaPCo2dCTDIYbd7ifg8=; b=FWYQs/6EVxuif/cCLhB2WJt8cxCrhHJieWw84HciwfH72StWHrOs7StdM2yITa187MUCFT mp3Rjw++2Uf8lk38ZzzCeegNRbAQfS0u/PoP0LjaN7sNXNMwpcT83KcrAk5aPWdQmEOCNS hhBPZFZjQa11rvGomCm86gg5jx36s0IX0n2sU7RT9/Ogpl2vLY1m74P3FnC9p7xaSoRclZ C2TFGJgla+GILcMud70UA54RzaGHO80npNPhifcF0LzDNX76cOS2mfFe7/Fd0zywJ+gpvL qqGNnSlKl1pW5ADl60rASBfy8gnHXYX1NneCFXRdVviUWDGd7KfBLQ+Oxybo3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750923484; a=rsa-sha256; cv=none; b=EGIA5gh5tfNZI1kEPJ/eDJjzctDopw7O3wZxHAjBq5LpJk4j6ObItiLbgOql/+zoDaCfcr 5sGuQJ/TpqUdLX+XX2xkdFLas1AeHtNMXQQDH5e23zTa6iVIlYmqWkG3M2UA+y0DJ8SZwH Irn3IRoSov4kUA4psZXlo1c8h5SIcF/ZwUpHWe3sSfhlrD3DxT9EGatm/t+LMsuG5AZQ/J IIJ9w0Aq2O49a6UBYE6ydxoOApcJV/fH7OCcQJRNPBsuIdlSCc1yUOwRCKsY9WDj85Gu/V +WowA6Z2slvaNwrupOpVDanUr/hMdazln4VNPFBtzdeK4yn6pQPw38RhQNE0oQ== 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 4bSVsS4y72zsnG; Thu, 26 Jun 2025 07:38:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55Q7c4KA080200; Thu, 26 Jun 2025 07:38:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55Q7c4mu080197; Thu, 26 Jun 2025 07:38:04 GMT (envelope-from git) Date: Thu, 26 Jun 2025 07:38:04 GMT Message-Id: <202506260738.55Q7c4mu080197@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 8ebc0768663b - main - scandir: Code cleanup. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 8ebc0768663b0ea9f78a0b8cffb93ee1684a9b08 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=8ebc0768663b0ea9f78a0b8cffb93ee1684a9b08 commit 8ebc0768663b0ea9f78a0b8cffb93ee1684a9b08 Author: Dag-Erling Smørgrav AuthorDate: 2025-06-26 07:37:06 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-06-26 07:37:06 +0000 scandir: Code cleanup. Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D51050 --- lib/libc/gen/scandir.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/lib/libc/gen/scandir.c b/lib/libc/gen/scandir.c index 56d77c29bd07..8e62fe980868 100644 --- a/lib/libc/gen/scandir.c +++ b/lib/libc/gen/scandir.c @@ -69,8 +69,8 @@ scandir_dirp_b(DIR *dirp, struct dirent ***namelist, select_block select, dcomp_block dcomp) #else scandir_dirp(DIR *dirp, struct dirent ***namelist, - int (*select)(const struct dirent *), int (*dcomp)(const struct dirent **, - const struct dirent **)) + int (*select)(const struct dirent *), + int (*dcomp)(const struct dirent **, const struct dirent **)) #endif { struct dirent *d, *p = NULL, **names = NULL, **names2; @@ -100,7 +100,7 @@ scandir_dirp(DIR *dirp, struct dirent ***namelist, * realloc the maximum size. */ if (numitems >= arraysz) { - arraysz = arraysz ? arraysz * 2 : 32; + arraysz = arraysz * 2; names2 = reallocarray(names, arraysz, sizeof(*names)); if (names2 == NULL) goto fail; @@ -115,13 +115,15 @@ scandir_dirp(DIR *dirp, struct dirent ***namelist, */ if (errno != 0) goto fail; - if (numitems && dcomp != NULL) + if (numitems > 0 && dcomp != NULL) { #ifdef I_AM_SCANDIR_B - qsort_b(names, numitems, sizeof(struct dirent *), (void*)dcomp); + qsort_b(names, numitems, sizeof(struct dirent *), + (void *)dcomp); #else qsort_r(names, numitems, sizeof(struct dirent *), scandir_thunk_cmp, &dcomp); #endif + } *namelist = names; return (numitems); @@ -142,8 +144,8 @@ scandir_b(const char *dirname, struct dirent ***namelist, select_block select, dcomp_block dcomp) #else scandir(const char *dirname, struct dirent ***namelist, - int (*select)(const struct dirent *), int (*dcomp)(const struct dirent **, - const struct dirent **)) + int (*select)(const struct dirent *), + int (*dcomp)(const struct dirent **, const struct dirent **)) #endif { DIR *dirp; @@ -171,8 +173,8 @@ fdscandir_b(int dirfd, struct dirent ***namelist, select_block select, dcomp_block dcomp) #else fdscandir(int dirfd, struct dirent ***namelist, - int (*select)(const struct dirent *), int (*dcomp)(const struct dirent **, - const struct dirent **)) + int (*select)(const struct dirent *), + int (*dcomp)(const struct dirent **, const struct dirent **)) #endif { DIR *dirp; @@ -200,8 +202,8 @@ scandirat_b(int dirfd, const char *dirname, struct dirent ***namelist, select_block select, dcomp_block dcomp) #else scandirat(int dirfd, const char *dirname, struct dirent ***namelist, - int (*select)(const struct dirent *), int (*dcomp)(const struct dirent **, - const struct dirent **)) + int (*select)(const struct dirent *), + int (*dcomp)(const struct dirent **, const struct dirent **)) #endif { int fd, ret, serrno;