From nobody Mon Apr 10 16:03:14 2023 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 4PwDKG5fN7z44Q7J; Mon, 10 Apr 2023 16:03:14 +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 4PwDKG5DXrz3wwT; Mon, 10 Apr 2023 16:03:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681142594; 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=oGGPPXcYkJLceTMiLu9EjctOGrANEDz3zqYAdJ/CoOc=; b=Lo6ihYKRZoB57w1UnPBuGT/NdkSXB6GY0sbofOdhq8s78v2jxwAOVGtfzT/tQe6OexNshi aVjVlpjiJCoqj1lls/5XfUNq4WzcNpX4HSM+aFNNzhVEMH7u8n7fmeiGDa/HgkN39lmahx 0WfDyoT2grDF+xExmVwGLiPm5W2rxriSlsTw5nPvuX4VIx0ep/Zkh5aA+luMamXzWwYmYW 5SI1DxV0pJlPuwxIqU3uCSSCValvtSWLD1EN1ZSS38B1Cp6pXyXH7hSnrHymNCPJvXxJQN Fc0EYqcU2QPeK28mYXHdgKhQY6Q1vAQ3iX8lYWg/93G9/5bXVWEUAP0o1klCBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681142594; 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=oGGPPXcYkJLceTMiLu9EjctOGrANEDz3zqYAdJ/CoOc=; b=hZkRaPkSbmxZYiG2Oe5mL5mWWb7sXG8TN3rnb2iF8Zp9K1nFMbnU0EwYXJCb35aK4k4blN cwVoX6luQrrUPB+V11W4IbQrV+p3P+IBmW62iBlfiyAOjk8kzY3c9MrWbbCNZKJf6zSG0J RAdLgtAPj/H2QdMJQT4eJm7FTCWsRNyQtP1dDCtZQHMAaWfRZe1DL4sQUy3QxUxfw42z0F aMQJ5XBVsl0L6OOlINJe/Tt7cpZF+LUhgpB9YWj6ilCB486NRCjLNTzca6ByK0DkfSQdh7 qbOUs8MeAEcCRs94iaj5CRIisLBX5/66wYX0pvSxnAn54rusuaGmIdB2HKsi5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681142594; a=rsa-sha256; cv=none; b=xwpCAjKmSt/ixHJBY4ZkQWQLyTirDkIPRIWvKRTzsWgEd0mXwic1NZmLn4ZAeumY9T5vpO OJPXRoiQJDSF8aNbSvrRA35yr2ztT9z4cKSvpWMOrVG4PEk9DgrWPMa0f6bO7yMToG6Z2/ I/WZZeG92hzFC5X/YDUHikkMivpjIO6x1XgO/tOCr76QxjCvVOixAQGVAsdbXY2WKY07pW 6nSWmLowoEIB2FVkezn8FNVWNYC4Mcskx1E7YSn9akSseHPOVq+4Kmj0D1ZqzmegJSOu9e NjgUHmocyew/S1E1tSnhzuBfp4oE/QCmWYQm4Os57xaW4vdBBD4K/xlT91ogSg== 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 4PwDKG40tZzx8Z; Mon, 10 Apr 2023 16:03:14 +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 33AG3EBl009883; Mon, 10 Apr 2023 16:03:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33AG3Ecv009882; Mon, 10 Apr 2023 16:03:14 GMT (envelope-from git) Date: Mon, 10 Apr 2023 16:03:14 GMT Message-Id: <202304101603.33AG3Ecv009882@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: c02e6ca7c22a - main - makefs: simplify filename conversion handling 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: c02e6ca7c22aa340fb261233f4f9c4438fee301a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c02e6ca7c22aa340fb261233f4f9c4438fee301a commit c02e6ca7c22aa340fb261233f4f9c4438fee301a Author: Ed Maste AuthorDate: 2023-03-31 13:05:52 +0000 Commit: Ed Maste CommitDate: 2023-04-10 16:03:06 +0000 makefs: simplify filename conversion handling Obtained from: OpenBSD 4095a2e01d18 Sponsored by: The FreeBSD Foundation --- 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