projects
/
carl9170fw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kconfig: avoid multiple calls to strlen
[carl9170fw.git]
/
config
/
confdata.c
diff --git
a/config/confdata.c
b/config/confdata.c
index 4a88b8dd7246f2beb956c66cce9ba0bb068925f6..8128254a6265626e1f89efdec27d6ea06b830ea1 100644
(file)
--- a/
config/confdata.c
+++ b/
config/confdata.c
@@
-1103,7
+1103,7
@@
void conf_set_changed_callback(void (*fn)(void))
conf_changed_callback = fn;
}
conf_changed_callback = fn;
}
-static
void
randomize_choice_values(struct symbol *csym)
+static
bool
randomize_choice_values(struct symbol *csym)
{
struct property *prop;
struct symbol *sym;
{
struct property *prop;
struct symbol *sym;
@@
-1116,7
+1116,7
@@
static void randomize_choice_values(struct symbol *csym)
* In both cases stop.
*/
if (csym->curr.tri != yes)
* In both cases stop.
*/
if (csym->curr.tri != yes)
- return;
+ return
false
;
prop = sym_get_choice_prop(csym);
prop = sym_get_choice_prop(csym);
@@
-1147,6
+1147,8
@@
static void randomize_choice_values(struct symbol *csym)
csym->flags |= SYMBOL_DEF_USER;
/* clear VALID to get value calculated */
csym->flags &= ~(SYMBOL_VALID);
csym->flags |= SYMBOL_DEF_USER;
/* clear VALID to get value calculated */
csym->flags &= ~(SYMBOL_VALID);
+
+ return true;
}
void set_all_choice_values(struct symbol *csym)
}
void set_all_choice_values(struct symbol *csym)
@@
-1169,7
+1171,7
@@
void set_all_choice_values(struct symbol *csym)
csym->flags &= ~(SYMBOL_VALID | SYMBOL_NEED_SET_CHOICE_VALUES);
}
csym->flags &= ~(SYMBOL_VALID | SYMBOL_NEED_SET_CHOICE_VALUES);
}
-
void
conf_set_all_new_symbols(enum conf_def_mode mode)
+
bool
conf_set_all_new_symbols(enum conf_def_mode mode)
{
struct symbol *sym, *csym;
int i, cnt, pby, pty, ptm; /* pby: probability of boolean = y
{
struct symbol *sym, *csym;
int i, cnt, pby, pty, ptm; /* pby: probability of boolean = y
@@
-1217,6
+1219,7
@@
void conf_set_all_new_symbols(enum conf_def_mode mode)
exit( 1 );
}
}
exit( 1 );
}
}
+ bool has_changed = false;
for_all_symbols(i, sym) {
if (sym_has_value(sym) || (sym->flags & SYMBOL_VALID))
for_all_symbols(i, sym) {
if (sym_has_value(sym) || (sym->flags & SYMBOL_VALID))
@@
-1224,6
+1227,7
@@
void conf_set_all_new_symbols(enum conf_def_mode mode)
switch (sym_get_type(sym)) {
case S_BOOLEAN:
case S_TRISTATE:
switch (sym_get_type(sym)) {
case S_BOOLEAN:
case S_TRISTATE:
+ has_changed = true;
switch (mode) {
case def_yes:
sym->def[S_DEF_USER].tri = yes;
switch (mode) {
case def_yes:
sym->def[S_DEF_USER].tri = yes;
@@
-1282,6
+1286,12
@@
void conf_set_all_new_symbols(enum conf_def_mode mode)
sym_calc_value(csym);
if (mode == def_random)
sym_calc_value(csym);
if (mode == def_random)
- randomize_choice_values(csym);
+ has_changed = randomize_choice_values(csym);
+ else {
+ set_all_choice_values(csym);
+ has_changed = true;
+ }
}
}
+
+ return has_changed;
}
}