There is a spelling mistake in "changable", it is corrected to "changeable" and all call sites are updated accordingly.
Showing the changes to scripts (7 of 7 files). Show all
Unified · Split
| @@ -90,7 +90,7 @@ static int conf_askvalue(struct symbol *sym, const char *def) · 89 unmodified lines | |||
| 90 | line[0] = '\n'; | 90 | line[0] = '\n'; |
| 91 | line[1] = 0; | 91 | line[1] = 0; |
| 92 | 92 | ||
| 93 | if (!sym_is_changable(sym)) { | 93 | if (!sym_is_changeable(sym)) { |
| 94 | printf("%s\n", def); | 94 | printf("%s\n", def); |
| 95 | line[0] = '\n'; | 95 | line[0] = '\n'; |
| 96 | line[1] = 0; | 96 | line[1] = 0; |
| @@ -234,7 +234,7 @@ static int conf_choice(struct menu *menu) · 137 unmodified lines | |||
| 234 | 234 | ||
| 235 | sym = menu->sym; | 235 | sym = menu->sym; |
| 236 | is_new = !sym_has_value(sym); | 236 | is_new = !sym_has_value(sym); |
| 237 | if (sym_is_changable(sym)) { | 237 | if (sym_is_changeable(sym)) { |
| 238 | conf_sym(menu); | 238 | conf_sym(menu); |
| 239 | sym_calc_value(sym); | 239 | sym_calc_value(sym); |
| 240 | switch (sym_get_tristate_value(sym)) { | 240 | switch (sym_get_tristate_value(sym)) { |
| @@ -418,7 +418,7 @@ static void check_conf(struct menu *menu) · 177 unmodified lines | |||
| 418 | 418 | ||
| 419 | sym = menu->sym; | 419 | sym = menu->sym; |
| 420 | if (sym && !sym_has_value(sym)) { | 420 | if (sym && !sym_has_value(sym)) { |
| 421 | if (sym_is_changable(sym) || | 421 | if (sym_is_changeable(sym) || |
| 422 | (sym_is_choice(sym) && sym_get_tristate_value(sym) == yes)) { | 422 | (sym_is_choice(sym) && sym_get_tristate_value(sym) == yes)) { |
| 423 | if (input_mode == listnewconfig) { | 423 | if (input_mode == listnewconfig) { |
| 424 | if (sym->name) { | 424 | if (sym->name) { |
| @@ -796,7 +796,7 @@ int conf_write_defconfig(const char *filename) · 795 unmodified lines | |||
| 796 | goto next_menu; | 796 | goto next_menu; |
| 797 | sym->flags &= ~SYMBOL_WRITE; | 797 | sym->flags &= ~SYMBOL_WRITE; |
| 798 | /* If we cannot change the symbol - skip */ | 798 | /* If we cannot change the symbol - skip */ |
| 799 | if (!sym_is_changable(sym)) | 799 | if (!sym_is_changeable(sym)) |
| 800 | goto next_menu; | 800 | goto next_menu; |
| 801 | /* If symbol equals to default value - skip */ | 801 | /* If symbol equals to default value - skip */ |
| 802 | if (strcmp(sym_get_string_value(sym), sym_get_string_default(sym)) == 0) | 802 | 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); · 41 unmodified lines | |||
| 42 | bool sym_string_valid(struct symbol *sym, const char *newval); | 42 | bool sym_string_valid(struct symbol *sym, const char *newval); |
| 43 | bool sym_string_within_range(struct symbol *sym, const char *str); | 43 | bool sym_string_within_range(struct symbol *sym, const char *str); |
| 44 | bool sym_set_string_value(struct symbol *sym, const char *newval); | 44 | bool sym_set_string_value(struct symbol *sym, const char *newval); |
| 45 | bool sym_is_changable(struct symbol *sym); | 45 | bool sym_is_changeable(struct symbol *sym); |
| 46 | struct property * sym_get_choice_prop(struct symbol *sym); | 46 | struct property * sym_get_choice_prop(struct symbol *sym); |
| 47 | const char * sym_get_string_value(struct symbol *sym); | 47 | const char * sym_get_string_value(struct symbol *sym); |
| 48 | 48 | ||
| @@ -536,7 +536,7 @@ static void build_conf(struct menu *menu) · 535 unmodified lines | |||
| 536 | } | 536 | } |
| 537 | 537 | ||
| 538 | val = sym_get_tristate_value(sym); | 538 | val = sym_get_tristate_value(sym); |
| 539 | if (sym_is_changable(sym)) { | 539 | if (sym_is_changeable(sym)) { |
| 540 | switch (type) { | 540 | switch (type) { |
| 541 | case S_BOOLEAN: | 541 | case S_BOOLEAN: |
| 542 | item_make("[%c]", val == no ? ' ' : '*'); | 542 | item_make("[%c]", val == no ? ' ' : '*'); |
| @@ -587,7 +587,7 @@ static void build_conf(struct menu *menu) · 44 unmodified lines | |||
| 587 | } else { | 587 | } else { |
| 588 | switch (type) { | 588 | switch (type) { |
| 589 | case S_BOOLEAN: | 589 | case S_BOOLEAN: |
| 590 | if (sym_is_changable(sym)) | 590 | if (sym_is_changeable(sym)) |
| 591 | item_make("[%c]", val == no ? ' ' : '*'); | 591 | item_make("[%c]", val == no ? ' ' : '*'); |
| 592 | else | 592 | else |
| 593 | item_make("-%c-", val == no ? ' ' : '*'); | 593 | item_make("-%c-", val == no ? ' ' : '*'); |
| @@ -600,7 +600,7 @@ static void build_conf(struct menu *menu) · 6 unmodified lines | |||
| 600 | case mod: ch = 'M'; break; | 600 | case mod: ch = 'M'; break; |
| 601 | default: ch = ' '; break; | 601 | default: ch = ' '; break; |
| 602 | } | 602 | } |
| 603 | if (sym_is_changable(sym)) { | 603 | if (sym_is_changeable(sym)) { |
| 604 | if (sym->rev_dep.tri == mod) | 604 | if (sym->rev_dep.tri == mod) |
| 605 | item_make("{%c}", ch); | 605 | item_make("{%c}", ch); |
| 606 | else | 606 | else |
| @@ -617,7 +617,7 @@ static void build_conf(struct menu *menu) · 10 unmodified lines | |||
| 617 | if (tmp < 0) | 617 | if (tmp < 0) |
| 618 | tmp = 0; | 618 | tmp = 0; |
| 619 | item_add_str("%*c%s%s", tmp, ' ', menu_get_prompt(menu), | 619 | item_add_str("%*c%s%s", tmp, ' ', menu_get_prompt(menu), |
| 620 | (sym_has_value(sym) || !sym_is_changable(sym)) ? | 620 | (sym_has_value(sym) || !sym_is_changeable(sym)) ? |
| 621 | "" : " (NEW)"); | 621 | "" : " (NEW)"); |
| 622 | item_set_tag('s'); | 622 | item_set_tag('s'); |
| 623 | item_set_data(menu); | 623 | item_set_data(menu); |
| @@ -625,7 +625,7 @@ static void build_conf(struct menu *menu) · 1 unmodified line | |||
| 625 | } | 625 | } |
| 626 | } | 626 | } |
| 627 | item_add_str("%*c%s%s", indent + 1, ' ', menu_get_prompt(menu), | 627 | item_add_str("%*c%s%s", indent + 1, ' ', menu_get_prompt(menu), |
| 628 | (sym_has_value(sym) || !sym_is_changable(sym)) ? | 628 | (sym_has_value(sym) || !sym_is_changeable(sym)) ? |
| 629 | "" : " (NEW)"); | 629 | "" : " (NEW)"); |
| 630 | if (menu->prompt->type == P_MENU) { | 630 | if (menu->prompt->type == P_MENU) { |
| 631 | item_add_str(" %s", menu_is_empty(menu) ? "----" : "--->"); | 631 | item_add_str(" %s", menu_is_empty(menu) ? "----" : "--->"); |
| @@ -803,7 +803,7 @@ static void build_conf(struct menu *menu) · 802 unmodified lines | |||
| 803 | } | 803 | } |
| 804 | 804 | ||
| 805 | val = sym_get_tristate_value(sym); | 805 | val = sym_get_tristate_value(sym); |
| 806 | if (sym_is_changable(sym)) { | 806 | if (sym_is_changeable(sym)) { |
| 807 | switch (type) { | 807 | switch (type) { |
| 808 | case S_BOOLEAN: | 808 | case S_BOOLEAN: |
| 809 | item_make(menu, 't', "[%c]", | 809 | item_make(menu, 't', "[%c]", |
| @@ -857,7 +857,7 @@ static void build_conf(struct menu *menu) · 47 unmodified lines | |||
| 857 | } else { | 857 | } else { |
| 858 | switch (type) { | 858 | switch (type) { |
| 859 | case S_BOOLEAN: | 859 | case S_BOOLEAN: |
| 860 | if (sym_is_changable(sym)) | 860 | if (sym_is_changeable(sym)) |
| 861 | item_make(menu, 't', "[%c]", | 861 | item_make(menu, 't', "[%c]", |
| 862 | val == no ? ' ' : '*'); | 862 | val == no ? ' ' : '*'); |
| 863 | else | 863 | else |
| @@ -876,7 +876,7 @@ static void build_conf(struct menu *menu) · 12 unmodified lines | |||
| 876 | ch = ' '; | 876 | ch = ' '; |
| 877 | break; | 877 | break; |
| 878 | } | 878 | } |
| 879 | if (sym_is_changable(sym)) { | 879 | if (sym_is_changeable(sym)) { |
| 880 | if (sym->rev_dep.tri == mod) | 880 | if (sym->rev_dep.tri == mod) |
| 881 | item_make(menu, | 881 | item_make(menu, |
| 882 | 't', "{%c}", ch); | 882 | 't', "{%c}", ch); |
| @@ -896,14 +896,14 @@ static void build_conf(struct menu *menu) · 13 unmodified lines | |||
| 896 | item_add_str("%*c%s%s", tmp, ' ', | 896 | item_add_str("%*c%s%s", tmp, ' ', |
| 897 | menu_get_prompt(menu), | 897 | menu_get_prompt(menu), |
| 898 | (sym_has_value(sym) || | 898 | (sym_has_value(sym) || |
| 899 | !sym_is_changable(sym)) ? "" : | 899 | !sym_is_changeable(sym)) ? "" : |
| 900 | " (NEW)"); | 900 | " (NEW)"); |
| 901 | goto conf_childs; | 901 | goto conf_childs; |
| 902 | } | 902 | } |
| 903 | } | 903 | } |
| 904 | item_add_str("%*c%s%s", indent + 1, ' ', | 904 | item_add_str("%*c%s%s", indent + 1, ' ', |
| 905 | menu_get_prompt(menu), | 905 | menu_get_prompt(menu), |
| 906 | (sym_has_value(sym) || !sym_is_changable(sym)) ? | 906 | (sym_has_value(sym) || !sym_is_changeable(sym)) ? |
| 907 | "" : " (NEW)"); | 907 | "" : " (NEW)"); |
| 908 | if (menu->prompt && menu->prompt->type == P_MENU) { | 908 | if (menu->prompt && menu->prompt->type == P_MENU) { |
| 909 | item_add_str(" %s", menu_is_empty(menu) ? "----" : "--->"); | 909 | item_add_str(" %s", menu_is_empty(menu) ? "----" : "--->"); |
| @@ -152,7 +152,7 @@ void ConfigItem::updateMenu(void) · 151 unmodified lines | |||
| 152 | case S_TRISTATE: | 152 | case S_TRISTATE: |
| 153 | char ch; | 153 | char ch; |
| 154 | 154 | ||
| 155 | if (!sym_is_changable(sym) && list->optMode == normalOpt) { | 155 | if (!sym_is_changeable(sym) && list->optMode == normalOpt) { |
| 156 | setPixmap(promptColIdx, QIcon()); | 156 | setPixmap(promptColIdx, QIcon()); |
| 157 | setText(noColIdx, QString::null); | 157 | setText(noColIdx, QString::null); |
| 158 | setText(modColIdx, QString::null); | 158 | setText(modColIdx, QString::null); |
| @@ -785,7 +785,7 @@ const char *sym_get_string_value(struct symbol *sym) · 784 unmodified lines | |||
| 785 | return (const char *)sym->curr.val; | 785 | return (const char *)sym->curr.val; |
| 786 | } | 786 | } |
| 787 | 787 | ||
| 788 | bool sym_is_changable(struct symbol *sym) | 788 | bool sym_is_changeable(struct symbol *sym) |
| 789 | { | 789 | { |
| 790 | return sym->visible > sym->rev_dep.tri; | 790 | return sym->visible > sym->rev_dep.tri; |
| 791 | } | 791 | } |