]> www.infradead.org Git - nvme.git/commitdiff
gcc-15: get rid of misc extra NUL character padding
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 20 Apr 2025 18:04:00 +0000 (11:04 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 20 Apr 2025 18:57:54 +0000 (11:57 -0700)
This removes two cases of explicit NUL padding that now causes warnings
because of '-Wunterminated-string-initialization' being part of -Wextra
in gcc-15.

Gcc is being silly in this case when it says that it truncates a NUL
terminator, because in these cases there were _multiple_ NUL characters.

But we can get rid of the warning by just simplifying the two
initializers that trigger the warning for me, so this does exactly that.

I'm not sure why the power supply code did that odd

    .attr_name = #_name "\0",

pattern: it was introduced in commit 2cabeaf15129 ("power: supply: core:
Cleanup power supply sysfs attribute list"), but that 'attr_name[]'
field is an explicitly sized character array in a statically initialized
variable, and a string initializer always has a terminating NUL _and_
statically initialized character arrays are zero-padded anyway, so it
really seems to be rather extraneous belt-and-suspenders.

The zero_uuid[16] initialization in drivers/md/bcache/super.c makes
perfect sense, but it isn't necessary for the same reasons, and not
worth the new gcc warning noise.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/md/bcache/super.c
drivers/power/supply/power_supply_sysfs.c

index e42f1400cea9d73e09ed232417ae9fdba51aa7f7..813b38aec3e4e07c54ed8ef717f9f381f8c9b29b 100644 (file)
@@ -546,7 +546,7 @@ static struct uuid_entry *uuid_find(struct cache_set *c, const char *uuid)
 
 static struct uuid_entry *uuid_find_empty(struct cache_set *c)
 {
-       static const char zero_uuid[16] = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
+       static const char zero_uuid[16] = { 0 };
 
        return uuid_find(c, zero_uuid);
 }
index edb058c19c9c44ad9ad97a626fc8f59e3d3735a6..439dd0bf8644e5921b273d614113f1f699bcc890 100644 (file)
@@ -33,7 +33,7 @@ struct power_supply_attr {
 [POWER_SUPPLY_PROP_ ## _name] =                        \
 {                                              \
        .prop_name = #_name,                    \
-       .attr_name = #_name "\0",               \
+       .attr_name = #_name,                    \
        .text_values = _text,                   \
        .text_values_len = _len,                \
 }