Commit 68876c38 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

kconfig: mconf,nconf: remove unneeded '\0' termination after snprintf() 



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: default avatarMasahiro Yamada <masahiroy@kernel.org>
parent f02aa48d

scripts/kconfig/mconf.c

+3 −8
Original line number Diff line number Diff line
@@ -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 {

scripts/kconfig/nconf.c

+3 −9
Original line number Diff line number Diff line
@@ -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;

}