From 98c3d868fb5a7da7356c58e8c51423975bbd078b Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Thu, 25 Dec 2025 21:28:14 +0100 Subject: [PATCH] fsck_msdosfs: avoid warnings about too-long initializer strings Mark `dot_name` and `dotdot_name` as as `__non_string`, to avoid warnings from clang 21 similar to: sbin/fsck_msdosfs/dir.c:466:39: error: initializer-string for character array is too long, array size is 11 but initializer has size 12 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 466 | static const u_char dot_name[11] = ". "; | ^~~~~~~~~~~~~ sbin/fsck_msdosfs/dir.c:467:39: error: initializer-string for character array is too long, array size is 11 but initializer has size 12 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 467 | static const u_char dotdot_name[11] = ".. "; | ^~~~~~~~~~~~~ MFC after: 3 days --- sbin/fsck_msdosfs/dir.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/fsck_msdosfs/dir.c b/sbin/fsck_msdosfs/dir.c index 19516d882e2..2d7e4bcdc38 100644 --- a/sbin/fsck_msdosfs/dir.c +++ b/sbin/fsck_msdosfs/dir.c @@ -463,8 +463,8 @@ checksize(struct fat_descriptor *fat, u_char *p, struct dosDirEntry *dir) return FSOK; } -static const u_char dot_name[11] = ". "; -static const u_char dotdot_name[11] = ".. "; +static const u_char dot_name[11] __nonstring = ". "; +static const u_char dotdot_name[11] __nonstring = ".. "; /* * Basic sanity check if the subdirectory have good '.' and '..' entries,