kconfig: Fix spelling of sym_is_changable
There is a spelling mistake in "changable", it is corrected to "changeable" and all call sites are updated accordingly. Signed-off-by: Marco Ammon <marco.ammon@fau.de> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
parent
a94a48b161
commit
baa23ec860
|
@ -90,7 +90,7 @@ static int conf_askvalue(struct symbol *sym, const char *def)
|
||||||
line[0] = '\n';
|
line[0] = '\n';
|
||||||
line[1] = 0;
|
line[1] = 0;
|
||||||
|
|
||||||
if (!sym_is_changable(sym)) {
|
if (!sym_is_changeable(sym)) {
|
||||||
printf("%s\n", def);
|
printf("%s\n", def);
|
||||||
line[0] = '\n';
|
line[0] = '\n';
|
||||||
line[1] = 0;
|
line[1] = 0;
|
||||||
|
@ -234,7 +234,7 @@ static int conf_choice(struct menu *menu)
|
||||||
|
|
||||||
sym = menu->sym;
|
sym = menu->sym;
|
||||||
is_new = !sym_has_value(sym);
|
is_new = !sym_has_value(sym);
|
||||||
if (sym_is_changable(sym)) {
|
if (sym_is_changeable(sym)) {
|
||||||
conf_sym(menu);
|
conf_sym(menu);
|
||||||
sym_calc_value(sym);
|
sym_calc_value(sym);
|
||||||
switch (sym_get_tristate_value(sym)) {
|
switch (sym_get_tristate_value(sym)) {
|
||||||
|
@ -418,7 +418,7 @@ static void check_conf(struct menu *menu)
|
||||||
|
|
||||||
sym = menu->sym;
|
sym = menu->sym;
|
||||||
if (sym && !sym_has_value(sym)) {
|
if (sym && !sym_has_value(sym)) {
|
||||||
if (sym_is_changable(sym) ||
|
if (sym_is_changeable(sym) ||
|
||||||
(sym_is_choice(sym) && sym_get_tristate_value(sym) == yes)) {
|
(sym_is_choice(sym) && sym_get_tristate_value(sym) == yes)) {
|
||||||
if (input_mode == listnewconfig) {
|
if (input_mode == listnewconfig) {
|
||||||
if (sym->name) {
|
if (sym->name) {
|
||||||
|
|
|
@ -796,7 +796,7 @@ int conf_write_defconfig(const char *filename)
|
||||||
goto next_menu;
|
goto next_menu;
|
||||||
sym->flags &= ~SYMBOL_WRITE;
|
sym->flags &= ~SYMBOL_WRITE;
|
||||||
/* If we cannot change the symbol - skip */
|
/* If we cannot change the symbol - skip */
|
||||||
if (!sym_is_changable(sym))
|
if (!sym_is_changeable(sym))
|
||||||
goto next_menu;
|
goto next_menu;
|
||||||
/* If symbol equals to default value - skip */
|
/* If symbol equals to default value - skip */
|
||||||
if (strcmp(sym_get_string_value(sym), sym_get_string_default(sym)) == 0)
|
if (strcmp(sym_get_string_value(sym), sym_get_string_default(sym)) == 0)
|
||||||
|
|
|
@ -42,7 +42,7 @@ tristate sym_toggle_tristate_value(struct symbol *sym);
|
||||||
bool sym_string_valid(struct symbol *sym, const char *newval);
|
bool sym_string_valid(struct symbol *sym, const char *newval);
|
||||||
bool sym_string_within_range(struct symbol *sym, const char *str);
|
bool sym_string_within_range(struct symbol *sym, const char *str);
|
||||||
bool sym_set_string_value(struct symbol *sym, const char *newval);
|
bool sym_set_string_value(struct symbol *sym, const char *newval);
|
||||||
bool sym_is_changable(struct symbol *sym);
|
bool sym_is_changeable(struct symbol *sym);
|
||||||
struct property * sym_get_choice_prop(struct symbol *sym);
|
struct property * sym_get_choice_prop(struct symbol *sym);
|
||||||
const char * sym_get_string_value(struct symbol *sym);
|
const char * sym_get_string_value(struct symbol *sym);
|
||||||
|
|
||||||
|
|
|
@ -536,7 +536,7 @@ static void build_conf(struct menu *menu)
|
||||||
}
|
}
|
||||||
|
|
||||||
val = sym_get_tristate_value(sym);
|
val = sym_get_tristate_value(sym);
|
||||||
if (sym_is_changable(sym)) {
|
if (sym_is_changeable(sym)) {
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case S_BOOLEAN:
|
case S_BOOLEAN:
|
||||||
item_make("[%c]", val == no ? ' ' : '*');
|
item_make("[%c]", val == no ? ' ' : '*');
|
||||||
|
@ -587,7 +587,7 @@ static void build_conf(struct menu *menu)
|
||||||
} else {
|
} else {
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case S_BOOLEAN:
|
case S_BOOLEAN:
|
||||||
if (sym_is_changable(sym))
|
if (sym_is_changeable(sym))
|
||||||
item_make("[%c]", val == no ? ' ' : '*');
|
item_make("[%c]", val == no ? ' ' : '*');
|
||||||
else
|
else
|
||||||
item_make("-%c-", val == no ? ' ' : '*');
|
item_make("-%c-", val == no ? ' ' : '*');
|
||||||
|
@ -600,7 +600,7 @@ static void build_conf(struct menu *menu)
|
||||||
case mod: ch = 'M'; break;
|
case mod: ch = 'M'; break;
|
||||||
default: ch = ' '; break;
|
default: ch = ' '; break;
|
||||||
}
|
}
|
||||||
if (sym_is_changable(sym)) {
|
if (sym_is_changeable(sym)) {
|
||||||
if (sym->rev_dep.tri == mod)
|
if (sym->rev_dep.tri == mod)
|
||||||
item_make("{%c}", ch);
|
item_make("{%c}", ch);
|
||||||
else
|
else
|
||||||
|
@ -617,7 +617,7 @@ static void build_conf(struct menu *menu)
|
||||||
if (tmp < 0)
|
if (tmp < 0)
|
||||||
tmp = 0;
|
tmp = 0;
|
||||||
item_add_str("%*c%s%s", tmp, ' ', menu_get_prompt(menu),
|
item_add_str("%*c%s%s", tmp, ' ', menu_get_prompt(menu),
|
||||||
(sym_has_value(sym) || !sym_is_changable(sym)) ?
|
(sym_has_value(sym) || !sym_is_changeable(sym)) ?
|
||||||
"" : " (NEW)");
|
"" : " (NEW)");
|
||||||
item_set_tag('s');
|
item_set_tag('s');
|
||||||
item_set_data(menu);
|
item_set_data(menu);
|
||||||
|
@ -625,7 +625,7 @@ static void build_conf(struct menu *menu)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
item_add_str("%*c%s%s", indent + 1, ' ', menu_get_prompt(menu),
|
item_add_str("%*c%s%s", indent + 1, ' ', menu_get_prompt(menu),
|
||||||
(sym_has_value(sym) || !sym_is_changable(sym)) ?
|
(sym_has_value(sym) || !sym_is_changeable(sym)) ?
|
||||||
"" : " (NEW)");
|
"" : " (NEW)");
|
||||||
if (menu->prompt->type == P_MENU) {
|
if (menu->prompt->type == P_MENU) {
|
||||||
item_add_str(" %s", menu_is_empty(menu) ? "----" : "--->");
|
item_add_str(" %s", menu_is_empty(menu) ? "----" : "--->");
|
||||||
|
|
|
@ -803,7 +803,7 @@ static void build_conf(struct menu *menu)
|
||||||
}
|
}
|
||||||
|
|
||||||
val = sym_get_tristate_value(sym);
|
val = sym_get_tristate_value(sym);
|
||||||
if (sym_is_changable(sym)) {
|
if (sym_is_changeable(sym)) {
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case S_BOOLEAN:
|
case S_BOOLEAN:
|
||||||
item_make(menu, 't', "[%c]",
|
item_make(menu, 't', "[%c]",
|
||||||
|
@ -857,7 +857,7 @@ static void build_conf(struct menu *menu)
|
||||||
} else {
|
} else {
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case S_BOOLEAN:
|
case S_BOOLEAN:
|
||||||
if (sym_is_changable(sym))
|
if (sym_is_changeable(sym))
|
||||||
item_make(menu, 't', "[%c]",
|
item_make(menu, 't', "[%c]",
|
||||||
val == no ? ' ' : '*');
|
val == no ? ' ' : '*');
|
||||||
else
|
else
|
||||||
|
@ -876,7 +876,7 @@ static void build_conf(struct menu *menu)
|
||||||
ch = ' ';
|
ch = ' ';
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (sym_is_changable(sym)) {
|
if (sym_is_changeable(sym)) {
|
||||||
if (sym->rev_dep.tri == mod)
|
if (sym->rev_dep.tri == mod)
|
||||||
item_make(menu,
|
item_make(menu,
|
||||||
't', "{%c}", ch);
|
't', "{%c}", ch);
|
||||||
|
@ -896,14 +896,14 @@ static void build_conf(struct menu *menu)
|
||||||
item_add_str("%*c%s%s", tmp, ' ',
|
item_add_str("%*c%s%s", tmp, ' ',
|
||||||
menu_get_prompt(menu),
|
menu_get_prompt(menu),
|
||||||
(sym_has_value(sym) ||
|
(sym_has_value(sym) ||
|
||||||
!sym_is_changable(sym)) ? "" :
|
!sym_is_changeable(sym)) ? "" :
|
||||||
" (NEW)");
|
" (NEW)");
|
||||||
goto conf_childs;
|
goto conf_childs;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
item_add_str("%*c%s%s", indent + 1, ' ',
|
item_add_str("%*c%s%s", indent + 1, ' ',
|
||||||
menu_get_prompt(menu),
|
menu_get_prompt(menu),
|
||||||
(sym_has_value(sym) || !sym_is_changable(sym)) ?
|
(sym_has_value(sym) || !sym_is_changeable(sym)) ?
|
||||||
"" : " (NEW)");
|
"" : " (NEW)");
|
||||||
if (menu->prompt && menu->prompt->type == P_MENU) {
|
if (menu->prompt && menu->prompt->type == P_MENU) {
|
||||||
item_add_str(" %s", menu_is_empty(menu) ? "----" : "--->");
|
item_add_str(" %s", menu_is_empty(menu) ? "----" : "--->");
|
||||||
|
|
|
@ -152,7 +152,7 @@ void ConfigItem::updateMenu(void)
|
||||||
case S_TRISTATE:
|
case S_TRISTATE:
|
||||||
char ch;
|
char ch;
|
||||||
|
|
||||||
if (!sym_is_changable(sym) && list->optMode == normalOpt) {
|
if (!sym_is_changeable(sym) && list->optMode == normalOpt) {
|
||||||
setPixmap(promptColIdx, QIcon());
|
setPixmap(promptColIdx, QIcon());
|
||||||
setText(noColIdx, QString::null);
|
setText(noColIdx, QString::null);
|
||||||
setText(modColIdx, QString::null);
|
setText(modColIdx, QString::null);
|
||||||
|
|
|
@ -785,7 +785,7 @@ const char *sym_get_string_value(struct symbol *sym)
|
||||||
return (const char *)sym->curr.val;
|
return (const char *)sym->curr.val;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool sym_is_changable(struct symbol *sym)
|
bool sym_is_changeable(struct symbol *sym)
|
||||||
{
|
{
|
||||||
return sym->visible > sym->rev_dep.tri;
|
return sym->visible > sym->rev_dep.tri;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue