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: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Michal Marek <mmarek@suse.cz>

1 files changed, 9 insertions, 2 deletions

diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c
index 87d4b15da951..261f926d8f4b 100644
--- a/scripts/kconfig/nconf.c
+++ b/scripts/kconfig/nconf.c
@@ -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 @@ again:
                                 _("Search Configuration"), search_help);
                 goto again;
         default:
+                str_free(&title);
                 return;
         }
 
@@ -726,6 +732,7 @@ again:
         show_scroll_win(main_window,
                         _("Search Results"), str_get(&res));
         str_free(&res);
+        str_free(&title);
 }