projects
/
carl9170fw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "kconfig: fix randomising choice entries in presence of KCONFIG_ALLCONFIG"
[carl9170fw.git]
/
config
/
menu.c
diff --git
a/config/menu.c
b/config/menu.c
index a3cade659f89cb5f67828b797ae49b9311bf1d98..f3bffa309333061ed5d852e7c00132107017add5 100644
(file)
--- a/
config/menu.c
+++ b/
config/menu.c
@@
-48,7
+48,7
@@
void menu_add_entry(struct symbol *sym)
{
struct menu *menu;
{
struct menu *menu;
- menu = malloc(sizeof(*menu));
+ menu =
x
malloc(sizeof(*menu));
memset(menu, 0, sizeof(*menu));
menu->sym = sym;
menu->parent = current_menu;
memset(menu, 0, sizeof(*menu));
menu->sym = sym;
menu->parent = current_menu;
@@
-508,7
+508,7
@@
const char *menu_get_help(struct menu *menu)
}
static void get_prompt_str(struct gstr *r, struct property *prop,
}
static void get_prompt_str(struct gstr *r, struct property *prop,
- struct
jk
_head *head)
+ struct
list
_head *head)
{
int i, j;
struct menu *submenu[8], *menu, *location = NULL;
{
int i, j;
struct menu *submenu[8], *menu, *location = NULL;
@@
-531,7
+531,7
@@
static void get_prompt_str(struct gstr *r, struct property *prop,
location = menu;
}
if (head && location) {
location = menu;
}
if (head && location) {
- jump = malloc(sizeof(struct jump_key));
+ jump =
x
malloc(sizeof(struct jump_key));
if (menu_is_visible(prop->menu)) {
/*
if (menu_is_visible(prop->menu)) {
/*
@@
-544,12
+544,13
@@
static void get_prompt_str(struct gstr *r, struct property *prop,
} else
jump->target = location;
} else
jump->target = location;
- if (
CIRCLEQ_EMPTY
(head))
+ if (
list_empty
(head))
jump->index = 0;
else
jump->index = 0;
else
- jump->index = CIRCLEQ_LAST(head)->index + 1;
+ jump->index = list_entry(head->prev, struct jump_key,
+ entries)->index + 1;
-
CIRCLEQ_INSERT_TAIL(head, jump, entries
);
+
list_add_tail(&jump->entries, head
);
}
if (i > 0) {
}
if (i > 0) {
@@
-573,7
+574,8
@@
static void get_prompt_str(struct gstr *r, struct property *prop,
/*
* head is optional and may be NULL
*/
/*
* head is optional and may be NULL
*/
-void get_symbol_str(struct gstr *r, struct symbol *sym, struct jk_head *head)
+void get_symbol_str(struct gstr *r, struct symbol *sym,
+ struct list_head *head)
{
bool hit;
struct property *prop;
{
bool hit;
struct property *prop;
@@
-612,7
+614,7
@@
void get_symbol_str(struct gstr *r, struct symbol *sym, struct jk_head *head)
str_append(r, "\n\n");
}
str_append(r, "\n\n");
}
-struct gstr get_relations_str(struct symbol **sym_arr, struct
jk
_head *head)
+struct gstr get_relations_str(struct symbol **sym_arr, struct
list
_head *head)
{
struct symbol *sym;
struct gstr res = str_new();
{
struct symbol *sym;
struct gstr res = str_new();