From nobody Fri Apr 14 12:52:56 2023 X-Original-To: dev-commits-src-branches@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 4Pybvt2dvqz45BRJ; Fri, 14 Apr 2023 12:52:58 +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 4Pybvs0TPlz3rlC; Fri, 14 Apr 2023 12:52:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681476777; 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=1YkC0eOfY63ZCGWUMcyPEgHVFnVQfyCgeRXB+pgWEgo=; b=WIKh3EQq1uvGuySM9xLdN1PEGC4v3AsxB9lHjAgvAm7r4X7TIR1p4ejdnzIHhuC/zh7Db7 gN5xOYu0nvWdKTdwEZe5kp37Vhu3LooJt68n/V91hUVZY7CAjYt7FNzNIJtp4x/1CdWaAI HdnvSSRutMqLVBBBrFBMscOO+O/mkLPqCW3u2g83NAvc7atrHIXAHs1E7B4AzWbZwkgqWG //+r1j8tc8od503ncqXPYVjjUTfrDRXP89TMSPZsTzi7RbAT0mVY6LjUoTIWW6NKRjNGnv lQCLSPoEVpJvAEEQFeiOEfbXQoYCLO7evzW237rbHJ7NYvUSy0xtY66ZWBHvNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681476777; 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=1YkC0eOfY63ZCGWUMcyPEgHVFnVQfyCgeRXB+pgWEgo=; b=aYpJh/jDS8r6Wd2B0ZzqVVtJBVeL+ox4Oxew3vkiUxVnHzzFE7nm3P8EYWh5nR2mSddcZU lA7JHK/6eDKSN328zc4E7dhC4eZ6vLDo5ow4w7mjo8dJ/ZTuPfDnbWLVNxfmPE74y8hYJD YOV3d5m9s0SkpdiQfT/ezUXNnHFkhlg3ecCQn24FVw1TZHL5ULjycDmGm5GB55DMfIfmhr i7mFGIQliZVa+3BlxYQ57lsVlH7pB13igW+3Q6V3hOnmAPZmbQTCPMAPVGQTeC3xpMs902 O79mArDHuV140sYDR3FXKsKWrz7FBacmZBwcEJ3ToTqjqZeYuDsU/IcH9FUUag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681476777; a=rsa-sha256; cv=none; b=g+4kOyxln0rNZg9ZLOXubuI9MkVbG6remJL/FAULT472V6ok3EigyFsLrHQaP2B7grcLHr Azbnx0jb5beWZBpXSegPLh6X7DFC6yKr+hEtu0YQLw05ygmW31FQ6f5m/r7Fs1ok86KEax GUIjmwAvbstXut1wF7qN+iwB246vtfw08hQ4cgF4I33PXRCip+H+PoYbWMuPLUOhaCDwAL IbhJd2RApTGjWcau7ttle2bDiKBLv19J0qymBj9taoHHCXAULoGibwSfnEXi2+ig2TXN7n B0Tcb/lhEikaVc52Jgamh6m3aEykOB8scZtK1a964QqZeK4XB+5cA954sTv5pQ== 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 4Pybvr6dwqzQ82; Fri, 14 Apr 2023 12:52: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 33ECquQw074888; Fri, 14 Apr 2023 12:52:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33ECquZN074887; Fri, 14 Apr 2023 12:52:56 GMT (envelope-from git) Date: Fri, 14 Apr 2023 12:52:56 GMT Message-Id: <202304141252.33ECquZN074887@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 066d6824fc55 - stable/13 - makefs: simplify filename conversion handling List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 066d6824fc55cabc514e86831a070ad7bf06d3ee Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=066d6824fc55cabc514e86831a070ad7bf06d3ee commit 066d6824fc55cabc514e86831a070ad7bf06d3ee Author: Ed Maste AuthorDate: 2023-03-31 13:05:52 +0000 Commit: Ed Maste CommitDate: 2023-04-14 12:10:38 +0000 makefs: simplify filename conversion handling Obtained from: OpenBSD 4095a2e01d18 Sponsored by: The FreeBSD Foundation (cherry picked from commit c02e6ca7c22aa340fb261233f4f9c4438fee301a) --- usr.sbin/makefs/cd9660.c | 29 +++++------------------------ 1 file changed, 5 insertions(+), 24 deletions(-) diff --git a/usr.sbin/makefs/cd9660.c b/usr.sbin/makefs/cd9660.c index cf2696e578a4..54c1794d1500 100644 --- a/usr.sbin/makefs/cd9660.c +++ b/usr.sbin/makefs/cd9660.c @@ -147,10 +147,6 @@ static int cd9660_level1_convert_filename(iso9660_disk *, const char *, char *, int); static int cd9660_level2_convert_filename(iso9660_disk *, const char *, char *, int); -#if 0 -static int cd9660_joliet_convert_filename(iso9660_disk *, const char *, char *, - int); -#endif static int cd9660_convert_filename(iso9660_disk *, const char *, char *, int); static void cd9660_populate_dot_records(iso9660_disk *, cd9660node *); static int64_t cd9660_compute_offsets(iso9660_disk *, cd9660node *, int64_t); @@ -1585,11 +1581,6 @@ cd9660_compute_full_filename(cd9660node *node, char *buf) errx(EXIT_FAILURE, "Pathname too long."); } -/* NEW filename conversion method */ -typedef int(*cd9660_filename_conversion_functor)(iso9660_disk *, const char *, - char *, int); - - /* * TODO: These two functions are almost identical. * Some code cleanup is possible here @@ -1722,16 +1713,6 @@ cd9660_level2_convert_filename(iso9660_disk *diskStructure, const char *oldname, return namelen + extlen + found_ext; } -#if 0 -static int -cd9660_joliet_convert_filename(iso9660_disk *diskStructure, const char *oldname, - char *newname, int is_file) -{ - /* TODO: implement later, move to cd9660_joliet.c ?? */ -} -#endif - - /* * Convert a file name to ISO compliant file name * @param char * oldname The original filename @@ -1745,13 +1726,13 @@ cd9660_convert_filename(iso9660_disk *diskStructure, const char *oldname, char *newname, int is_file) { assert(1 <= diskStructure->isoLevel && diskStructure->isoLevel <= 2); - /* NEW */ - cd9660_filename_conversion_functor conversion_function = NULL; if (diskStructure->isoLevel == 1) - conversion_function = &cd9660_level1_convert_filename; + return(cd9660_level1_convert_filename(diskStructure, + oldname, newname, is_file)); else if (diskStructure->isoLevel == 2) - conversion_function = &cd9660_level2_convert_filename; - return (*conversion_function)(diskStructure, oldname, newname, is_file); + return (cd9660_level2_convert_filename(diskStructure, + oldname, newname, is_file)); + abort(); } int