Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 29 Dec 2024 20:30:24 GMT
From:      Ed Maste <emaste@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 788e1eb7c199 - main - makefs: Remove impossible if condition
Message-ID:  <202412292030.4BTKUO9P006780@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=788e1eb7c199297aa438fc5cb6caabc9be01b419

commit 788e1eb7c199297aa438fc5cb6caabc9be01b419
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2024-12-24 01:58:37 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
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++;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202412292030.4BTKUO9P006780>