From nobody Sun Dec 29 20:30:24 2024 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 4YLrTD31zFz5jlgR; Sun, 29 Dec 2024 20:30:24 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLrTD29dYz4KWY; Sun, 29 Dec 2024 20:30:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735504224; 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=0xwT1URBGEspE8zUsrtmNNCxOSh43l1AWMfGsRqJUj0=; b=N3jqZYpwVmUieTSPwqLaNhIerwO+6wfaNEX6TrjvX7GhbVdUxhz0BwoNuMAQGwLR0Ml1nB 17gXkA5W7SZ4+7OsuONIJjOKLDI99pZS4+re4zbnDkS6xJ7NfuAV9Q2cNbd7HmW9u8DYJZ PARvmNoVqECqUQeXQtA/rB04fqqZMW/fYVoybcEpOV6XyFKswugO65wW6Xwx8qu5Nc1rw6 qkyil6EJXWfvPD9SXrPvHO8oYc5jfALJ/qjHZ59cai/+R4BOWiTcnZ6mjBKCSrHny/5YYA Wvh4huOSB8hfeGIqx4J6w8BCsjtb8CU6dSzTUSX+cb9Fr7FgTT/VX7Ht4ZFVXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735504224; 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=0xwT1URBGEspE8zUsrtmNNCxOSh43l1AWMfGsRqJUj0=; b=hPxPaIWKWC6jvtc8YwcOSddszuaxGa2RPpeWvtvj/gguUgj9Dti/omarr+i7zC7dZQOAJS sJLXN0KNldMssTpqBK9seHGtYbnjph+tfStvdTiz+k2N+Lg7rn/Br3Qk2wDU+q1aUWOKv4 B65o7LP9wMTusZlI7Jqdc79q7lt/OauUfM47UPc9N+ITiFVwJ7vLava+6DYmvP1k00IbXR ZgIkv3S8PSzjURim+RezTLvP36xEPkFf7Jx4YCcuuR0hYqL3FzusiU0lN/H1x/ivKWNPVu /oNR6npYxdYxk0ny8pD/e+RKHeSwWhuk/LzpzaTIHAxePY8zrc1Qd0mJc1SWiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735504224; a=rsa-sha256; cv=none; b=sc1YRkAS/E8E0uzDPk5tDTYku3Yz9mnzYLR5tnsd9jWZ1NSt54cj/fuY9k8fX7+KqDLtqS j1DVCC+ecs2KmBibzkjdmayE9fbIXv60GykirikaHooLjZKxTi1v1bl7YwWrtt2FWrpwEn FARtSf8G+66FKX/D8GClj2cUCyM85DrRS83rbTv3Zl+8t7VGAfOwuR0cpTJZf1Fv5XPS6z 67LNejS+FRwrd7hZs5oOOifW3jjBS4i9GdEzMQG20xPb6g615di9iun6MRPRi6IOkoANW/ smliCMjAz0/rC66SUxiaI+X/1SkhcF2pHWCPE1CVnttGrWsrQel+YRU4o27OVA== 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 4YLrTD1TF1zNw1; Sun, 29 Dec 2024 20:30:24 +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 4BTKUOKW006783; Sun, 29 Dec 2024 20:30:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BTKUO9P006780; Sun, 29 Dec 2024 20:30:24 GMT (envelope-from git) Date: Sun, 29 Dec 2024 20:30:24 GMT Message-Id: <202412292030.4BTKUO9P006780@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: 788e1eb7c199 - main - makefs: Remove impossible if condition 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 788e1eb7c199297aa438fc5cb6caabc9be01b419 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=788e1eb7c199297aa438fc5cb6caabc9be01b419 commit 788e1eb7c199297aa438fc5cb6caabc9be01b419 Author: Ed Maste AuthorDate: 2024-12-24 01:58:37 +0000 Commit: Ed Maste CommitDate: 2024-12-29 20:28:32 +0000 makefs: Remove impossible if condition This test is inside the else block for `if (*oldname == '.')`, so *oldname cannot be '.' here. Reviewed by: kevans Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48243 --- usr.sbin/makefs/cd9660.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/usr.sbin/makefs/cd9660.c b/usr.sbin/makefs/cd9660.c index bc9895730b84..63f2e33b978b 100644 --- a/usr.sbin/makefs/cd9660.c +++ b/usr.sbin/makefs/cd9660.c @@ -1664,12 +1664,8 @@ cd9660_level2_convert_filename(iso9660_disk *diskStructure, const char *oldname, else if (isupper((unsigned char)*oldname) || isdigit((unsigned char)*oldname)) *newname++ = *oldname; - else if (diskStructure->allow_multidot && - *oldname == '.') { - *newname++ = '.'; - } else { + else *newname++ = '_'; - } if (found_ext) extlen++;