Skip to content

Commit

Permalink
kconfig: menuconfig: remove jump_key::index
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
masahir0y committed Jul 24, 2023
1 parent e14f124 commit 356f0cb
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 12 deletions.
1 change: 0 additions & 1 deletion scripts/kconfig/expr.h
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,6 @@ struct jump_key {
struct list_head entries;
size_t offset;
struct menu *target;
int index;
};

extern struct file *file_list;
Expand Down
7 changes: 4 additions & 3 deletions scripts/kconfig/mconf.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@
#include "lkc.h"
#include "lxdialog/dialog.h"

#define JUMP_NB 9

static const char mconf_readme[] =
"Overview\n"
"--------\n"
Expand Down Expand Up @@ -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;
}
Expand Down
8 changes: 0 additions & 8 deletions scripts/kconfig/menu.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down

0 comments on commit 356f0cb

Please sign in to comment.