kconfig: menuconfig: remove jump_key::index

You do not need to remember the index of each jump key because you can
count it up after a key is pressed.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Jesse Taube <Mr.Bossman075@gmail.com>

diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h
index 9c9caca5bd5f2ab595a525c6ee6b6d009a78fda2..4a9a23b1b7e1f91315f17675685d11dd97c4aa4d 100644 (file)
--- a/scripts/kconfig/expr.h
+++ b/scripts/kconfig/expr.h
@@ -275,7 +275,6 @@ struct jump_key {
        struct list_head entries;
        size_t offset;
        struct menu *target;
-       int index;
 };
 
 extern struct file *file_list;

diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index 15b88921fe6a5cc40668933c573586685e00c93f..eccc87a441e713a8b9013e3b286a176688ece372 100644 (file)
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -22,8 +22,6 @@
 #include "lkc.h"
 #include "lxdialog/dialog.h"
 
-#define JUMP_NB                        9
-
 static const char mconf_readme[] =
 "Overview\n"
 "--------\n"
@@ -402,18 +400,21 @@ static int handle_search_keys(int key, size_t start, size_t end, void *_data)
 {
        struct search_data *data = _data;
        struct jump_key *pos;
+       int index = 0;
 
        if (key < '1' || key > '9')
                return 0;
 
        list_for_each_entry(pos, data->head, entries) {
+               index = next_jump_key(index);
+
                if (pos->offset < start)
                        continue;
 
                if (pos->offset >= end)
                        break;
 
-               if (key == '1' + (pos->index % JUMP_NB)) {
+               if (key == index) {
                        data->target = pos->target;
                        return 1;
                }

diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index d2f0a8efabb55254d4e37c076b8398aca89144d4..61c442d84aef4a0dd11a2512314fb2d5bea169d2 100644 (file)
--- a/scripts/kconfig/menu.c
+++ b/scripts/kconfig/menu.c
@@ -735,15 +735,7 @@ static void get_prompt_str(struct gstr *r, struct property *prop,
        }
        if (head && location) {
                jump = xmalloc(sizeof(struct jump_key));
-
                jump->target = location;
-
-               if (list_empty(head))
-                       jump->index = 0;
-               else
-                       jump->index = list_entry(head->prev, struct jump_key,
-                                                entries)->index + 1;
-
                list_add_tail(&jump->entries, head);
        }