Skip to content

Commit

Permalink
kconfig: Only generate config_is_xxx for bool and tristate options
Browse files Browse the repository at this point in the history
For strings and integers, the config_is_xxx macros are useless and
sometimes misleading:

  #define CONFIG_INITRAMFS_SOURCE ""
  #define config_is_initramfs_source() 1

Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
  • Loading branch information
Michal Marek committed May 25, 2011
1 parent 51f31af commit 4c54f0f
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions scripts/kconfig/confdata.c
Original file line number Diff line number Diff line change
Expand Up @@ -798,7 +798,6 @@ int conf_write_autoconf(void)
const char *name;
FILE *out, *tristate, *out_h;
int i;
int fct_val;

sym_clear_all_valid();

Expand Down Expand Up @@ -839,7 +838,7 @@ int conf_write_autoconf(void)
rootmenu.prompt->text);

for_all_symbols(i, sym) {
fct_val = 1;
int fct_val = 0;
sym_calc_value(sym);
if (!(sym->flags & SYMBOL_WRITE) || !sym->name)
continue;
Expand All @@ -853,7 +852,6 @@ int conf_write_autoconf(void)
case S_TRISTATE:
switch (sym_get_tristate_value(sym)) {
case no:
fct_val = 0;
break;
case mod:
fprintf(tristate, "%s%s=M\n",
Expand All @@ -868,8 +866,10 @@ int conf_write_autoconf(void)
CONFIG_, sym->name);
fprintf(out_h, "#define %s%s 1\n",
CONFIG_, sym->name);
fct_val = 1;
break;
}
conf_write_function_autoconf(out_h, CONFIG_, sym->name, fct_val);
break;
case S_STRING:
conf_write_string(true, sym->name, sym_get_string_value(sym), out_h);
Expand All @@ -887,10 +887,8 @@ int conf_write_autoconf(void)
CONFIG_, sym->name, str);
break;
default:
fct_val = 0;
break;
}
conf_write_function_autoconf(out_h, CONFIG_, sym->name, fct_val);
}
fclose(out);
fclose(tristate);
Expand Down

0 comments on commit 4c54f0f

Please sign in to comment.