]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
kconfig: mconf,nconf: remove unneeded '\0' termination after snprintf()
authorMasahiro Yamada <masahiroy@kernel.org>
Sat, 10 Apr 2021 19:45:30 +0000 (04:45 +0900)
committerMasahiro Yamada <masahiroy@kernel.org>
Wed, 14 Apr 2021 06:22:49 +0000 (15:22 +0900)
snprintf() always terminates the destination buffer with '\0' even if
the buffer is not long enough. (In this case, the last element of the
buffer becomes '\0'.)

The explicit termination is unneeded.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
scripts/kconfig/mconf.c
scripts/kconfig/nconf.c

index 4cfbe62938cd63c4fb3fa2b3ce60b694d6e8f131..9d3cf510562f86e45af5920a0b9694e87eaf4c7d 100644 (file)
@@ -299,17 +299,12 @@ static char filename[PATH_MAX+1];
 static void set_config_filename(const char *config_filename)
 {
        static char menu_backtitle[PATH_MAX+128];
-       int size;
 
-       size = snprintf(menu_backtitle, sizeof(menu_backtitle),
-                       "%s - %s", config_filename, rootmenu.prompt->text);
-       if (size >= sizeof(menu_backtitle))
-               menu_backtitle[sizeof(menu_backtitle)-1] = '\0';
+       snprintf(menu_backtitle, sizeof(menu_backtitle), "%s - %s",
+                config_filename, rootmenu.prompt->text);
        set_dialog_backtitle(menu_backtitle);
 
-       size = snprintf(filename, sizeof(filename), "%s", config_filename);
-       if (size >= sizeof(filename))
-               filename[sizeof(filename)-1] = '\0';
+       snprintf(filename, sizeof(filename), "%s", config_filename);
 }
 
 struct subtitle_part {
index 0cce69ccb611c415c28bb72553ce049f1a0e4fa9..06ebe16e4a382235b2e2f95055acbae682790842 100644 (file)
@@ -633,16 +633,10 @@ static char filename[PATH_MAX+1];
 static char menu_backtitle[PATH_MAX+128];
 static const char *set_config_filename(const char *config_filename)
 {
-       int size;
+       snprintf(menu_backtitle, sizeof(menu_backtitle), "%s - %s",
+                config_filename, rootmenu.prompt->text);
 
-       size = snprintf(menu_backtitle, sizeof(menu_backtitle),
-                       "%s - %s", config_filename, rootmenu.prompt->text);
-       if (size >= sizeof(menu_backtitle))
-               menu_backtitle[sizeof(menu_backtitle)-1] = '\0';
-
-       size = snprintf(filename, sizeof(filename), "%s", config_filename);
-       if (size >= sizeof(filename))
-               filename[sizeof(filename)-1] = '\0';
+       snprintf(filename, sizeof(filename), "%s", config_filename);
        return menu_backtitle;
 }