From nobody Thu Feb 5 15:27:28 2026 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 4f6Lgh5bsnz6QknC for ; Thu, 05 Feb 2026 15:27:28 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6Lgh3ZQWz3XN1 for ; Thu, 05 Feb 2026 15:27:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770305248; 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=FHrTrJGFuKJPMkuWCvtvUhADmimYr4qNU62jjlyObIA=; b=C4ZIKWY9DnTb4JBHwzoT4nQDsKt6t6TJJO0GVuSlmsppBQUHwaNkctWttt7OJHF/p2TD03 itS/sUSAOQi3Bg28wCIXgmVVDLBhivDnhrJpDCuQKsZ7XN8EGJ69kjSybtH0/T+PNyRPUC wDI5RfcdelmqdNFDcghYusp1E045gTLPM9hdV+F4J5KE/QjsEPEvm9+lmOJsqnuIjTeYeL yclSzV/JL/wuzfdpKbjjBt9WszuNx7S18OCJBwWR3QSBFXRTqCzAQsATjeu++o8ylzVufT Tb9QV2ICnfDqPkm6e0dpEYVEwu484/KhP+GL1NLgrTM+cig9hLCHr+Tp9fAHlA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770305248; a=rsa-sha256; cv=none; b=O9eoa7/FQKX0SeiqXOVd4ZCckQwbgrUcyEAHB2bL0jowME3RDu9c3zGu6lJxnM9M3vS6ik aiPWomXfrhUx4Fets98vD9rqsbjKbwrJTa1QXfEIRJ4ONyINziUp6KMz3BH1cL5ZcAl45c owCAjkfg6BpdooFiNFIekcrDrrlPyHC+9LEpm2e+T4xCeP1vsjEg9u3aeHhVeL1mcw9iJ4 VxE5G0XB8djmdf44RmAxyzpEtsn664q71Jn8yQ8sfV4fwIbhubYhAdzxzeplo3iNlBx7Vb peEtFjERO9nHV1kFMo3DiW2j8eeg3CRQqS3ytRxE/kKLBsf8wIdhjzCru5FQ1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770305248; 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=FHrTrJGFuKJPMkuWCvtvUhADmimYr4qNU62jjlyObIA=; b=KwYPb9e2900hSF64L7JRi6m1+T76JU3JtMwZuFkuU2WSSQkPMOhtEnMLOTRwR3IbmeZ78L BLv7G2CLHYXZOYqFuGd+rQ8bu1SjYmv0Qbr4er5fGb6nqpxppG+czXX9Kf5tZ8G2kkaRU4 8c2raknjeWrVO50R/+tIZLvdlESOsA980wja/QhE+SfwYW5850XIGxI22auuwGhekd6RVy sNWK8ZH9GnkflYQrXN+UmqGFJNS7qAZNcDBjtwySn1TEDDFC4teDcMbIEJEtH6FBDppo5J zirV65D1beJA3hdOomKLGgXqEsHb4WvLI0qkoZc1i+WnqIYOiNCG0ZfZf1MUaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6Lgh2tPGzbxF for ; Thu, 05 Feb 2026 15:27:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18a84 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 15:27:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: d2f8f53385b3 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: d2f8f53385b3f2b42e38c387cb1ccba4518167e9 Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 15:27:28 +0000 Message-Id: <6984b6e0.18a84.1b018149@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=d2f8f53385b3f2b42e38c387cb1ccba4518167e9 commit d2f8f53385b3f2b42e38c387cb1ccba4518167e9 Author: Dag-Erling Smørgrav AuthorDate: 2025-06-26 07:37:06 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-05 14:47:46 +0000 scandir: Code cleanup. Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D51050 (cherry picked from commit 8ebc0768663b0ea9f78a0b8cffb93ee1684a9b08) --- 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 4d1ccab14f91..3f13248a3f2b 100644 --- a/lib/libc/gen/scandir.c +++ b/lib/libc/gen/scandir.c @@ -71,8 +71,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; @@ -102,7 +102,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; @@ -117,13 +117,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); @@ -144,8 +146,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; @@ -173,8 +175,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; @@ -202,8 +204,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;