From nobody Wed Jul 9 19:17:37 2025 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 4bcnmf326Tz60rDV; Wed, 09 Jul 2025 19:17:38 +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 4bcnmf1xHfz46J7; Wed, 09 Jul 2025 19:17:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752088658; 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=yhwGBYba40XtcaY1Y8C8xjF4TA8T3EJZ2WNoF5Fj6uw=; b=H4bKTTb4A1wCTXoHhKCe8wdwzBeqldLtW/YUOsm3zNbXEZF0IyYyAqpls5SM8jGGDWV3YO fVPJ+Ga1i6JryIQzUWZ9RL4CyXBWS7KovpRCfIv65IDURftCoQzEZ78mR5DNGZQ9yo8sYX DzmGLERO8ok/oCmjRBmhxqSyhzil2AMPmcztsiYYyL1wmuQw9g9+Plpl+04gFdkLFAZf/K PIZAL+ekyFS1LjQKfaO/Sranm1Nr8spejvJxP2Eww53JygIB2KGLhYO0Ln0/PM1qnuoUps /Qe//oWG+09R/sZB2IMYVF0PXBnyoy5TMMzSvtfoI8e0wrqAccw42aKtWOQe3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752088658; 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=yhwGBYba40XtcaY1Y8C8xjF4TA8T3EJZ2WNoF5Fj6uw=; b=FjELnb21Bbgw24R00j5sze8c8TLJC4AcT9OHJXPs3qWvAeVc4bZ951KmSmcsDvuy+ZYuZR 7CrUZDnQ7kGTID4ehipKA4089HaVzAErRcM4VYDr7dz4nEiX2ZALF7gEw09+Uw7G4mZr5C vnejXQq1SoB5VBfthmMnf94jQqmWIU8CiDLE9D01JQdmLOUxNg65e4t5UiagA6p206Rm91 TRQJRJjCZwzeKUILtzaT0aR1dwsPWC4StfKgGtln+tDvjtyLUVCohttXyTxPOekiG8/skT pUu+pDatgP/3fVSXkt4qsCZb+W1REIxVEC+ccoyjSRewPhnDgMDmJQpIPk0npA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752088658; a=rsa-sha256; cv=none; b=tCkF994mZgOkFg/Wh4Ia/IlsUmo7I9gX9YnCecOAYjbw6TMiZ85/49cW25b3+vQB3M4LsQ lSKZRuxsGwfo+bukK8Nvtox+7di+bTrlVjlPUIWOfIPJobkGP++aWlPPW2xSgwj6Tr1ib9 KyR86F9f62ja8CekT5CW3cJnoajVA8wXMkpiFTQxaUg+gyhvC57aNlWEtx2p5f9CUJ7F57 ZtUzYZ1REEUzG7VDkC8/N+d0UfB0LZN6DDxhU8+S6vDOu8ZZUG2nMgg2qQFaLp7lsz3fTk 3hUasokNUQEQ4Cf0YD3LMsNntyHBI62IRM7sHehnBsSYXViuJv3ltUujypmtuw== 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 4bcnmd6zPDzbtC; Wed, 09 Jul 2025 19:17:37 +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 569JHbml016663; Wed, 9 Jul 2025 19:17:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 569JHbhl016660; Wed, 9 Jul 2025 19:17:37 GMT (envelope-from git) Date: Wed, 9 Jul 2025 19:17:37 GMT Message-Id: <202507091917.569JHbhl016660@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: ccf937320a1a - main - libc: Finish removing fscandir{,_b}(). 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: ccf937320a1a7383a2c33698007b7244f66dc022 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=ccf937320a1a7383a2c33698007b7244f66dc022 commit ccf937320a1a7383a2c33698007b7244f66dc022 Author: Dag-Erling Smørgrav AuthorDate: 2025-07-09 19:16:40 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-07-09 19:17:06 +0000 libc: Finish removing fscandir{,_b}(). These only existed for a few days before being renamed, so there's no reason to continue to carry compatibility shims for them. Fixes: deeebfdecab5 Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D50981 --- ObsoleteFiles.inc | 4 ---- lib/libc/gen/Symbol.map | 2 -- lib/libc/gen/scandir.c | 6 ------ 3 files changed, 12 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index faf7c421af80..d1095b57c342 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -60,10 +60,6 @@ MOVED_LIBS+=usr/lib/libtpool.so.2 # 20250626: replace yaml.lua with lyaml OLD_FILES+=usr/share/flua/yaml.lua -# 20250623: fscandir() renamed to fdscandir() -OLD_FILES+=usr/share/man/man3/fscandir.3.gz -OLD_FILES+=usr/share/man/man3/fscandir_b.3.gz - # 20250615: don't install man page for absent function OLD_FILES+=usr/share/man/man9/vm_map_simplify_entry.9.gz diff --git a/lib/libc/gen/Symbol.map b/lib/libc/gen/Symbol.map index 50dbf3425964..c2020ac3d8d2 100644 --- a/lib/libc/gen/Symbol.map +++ b/lib/libc/gen/Symbol.map @@ -458,8 +458,6 @@ FBSD_1.8 { aio_read2; aio_write2; execvpe; - fscandir; - fscandir_b; fdscandir; fdscandir_b; fts_open_b; diff --git a/lib/libc/gen/scandir.c b/lib/libc/gen/scandir.c index 8e62fe980868..fb589f4b36b6 100644 --- a/lib/libc/gen/scandir.c +++ b/lib/libc/gen/scandir.c @@ -252,9 +252,3 @@ scandir_thunk_cmp(const void *p1, const void *p2, void *thunk) return (dc((const struct dirent **)p1, (const struct dirent **)p2)); } #endif - -#ifdef I_AM_SCANDIR_B -__weak_reference(fdscandir_b, fscandir_b); -#else -__weak_reference(fdscandir, fscandir); -#endif