Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 337a275d authored by Yann E. MORIN's avatar Yann E. MORIN Committed by Michal Marek
Browse files

kconfig: remove CONFIG_ from string constants 



Having the CONFIG_ prefix in string constants gets in the way of
using a run-time-defined CONFIG_ prefix.

Fix that by using temp growable strings (gstr) in which we printf
the text.

Signed-off-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
parent 7d5bb966

scripts/kconfig/mconf.c

+8 −2
Original line number Diff line number Diff line
@@ -348,15 +348,19 @@ static void search_conf(void) 
{

	struct symbol **sym_arr;

	struct gstr res;

	struct gstr title;

	char *dialog_input;

	int dres, vscroll = 0, hscroll = 0;

	bool again;



	title = str_new();

	str_printf( &title, _("Enter %s (sub)string to search for "

			      "(with or without \"%s\")"), CONFIG_, CONFIG_);



again:

	dialog_clear();

	dres = dialog_inputbox(_("Search Configuration Parameter"),

			      _("Enter " CONFIG_ " (sub)string to search for "

				"(with or without \"" CONFIG_ "\")"),

			      str_get(&title),

			      10, 75, "");

	switch (dres) {

	case 0:
@@ -365,6 +369,7 @@ static void search_conf(void) 
		show_helptext(_("Search Configuration"), search_help);

		goto again;

	default:

		str_free(&title);

		return;

	}
@@ -398,6 +403,7 @@ static void search_conf(void) 
		str_free(&res);

	} while (again);

	free(sym_arr);

	str_free(&title);

}



static void build_conf(struct menu *menu)

scripts/kconfig/nconf.c

+9 −2
Original line number Diff line number Diff line
@@ -696,13 +696,18 @@ static void search_conf(void) 
{

	struct symbol **sym_arr;

	struct gstr res;

	struct gstr title;

	char *dialog_input;

	int dres;



	title = str_new();

	str_printf( &title, _("Enter %s (sub)string to search for "

			      "(with or without \"%s\")"), CONFIG_, CONFIG_);



again:

	dres = dialog_inputbox(main_window,

			_("Search Configuration Parameter"),

			_("Enter " CONFIG_ " (sub)string to search for "

				"(with or without \"" CONFIG_ "\")"),

			str_get(&title),

			"", &dialog_input_result, &dialog_input_result_len);

	switch (dres) {

	case 0:
@@ -712,6 +717,7 @@ static void search_conf(void) 
				_("Search Configuration"), search_help);

		goto again;

	default:

		str_free(&title);

		return;

	}
@@ -726,6 +732,7 @@ static void search_conf(void) 
	show_scroll_win(main_window,

			_("Search Results"), str_get(&res));

	str_free(&res);

	str_free(&title);

}