Skip to content

Commit

Permalink
kconfig: refactor listnewconfig code
Browse files Browse the repository at this point in the history
We can reuse __print_symbol() helper to print symbols for listnewconfig.
Only the difference is the format for "n" symbols.

This prints "CONFIG_FOO=n" instead of "# CONFIG_FOO is not set".

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
  • Loading branch information
Masahiro Yamada committed Oct 11, 2021
1 parent 6ce45a9 commit 51d792c
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 12 deletions.
14 changes: 2 additions & 12 deletions scripts/kconfig/conf.c
Original file line number Diff line number Diff line change
Expand Up @@ -646,18 +646,8 @@ static void check_conf(struct menu *menu)

switch (input_mode) {
case listnewconfig:
if (sym->name) {
const char *val = sym_get_string_value(sym);
char *escaped = NULL;

if (sym->type == S_STRING) {
escaped = sym_escape_string_value(val);
val = escaped;
}

printf("%s%s=%s\n", CONFIG_, sym->name, val);
free(escaped);
}
if (sym->name)
print_symbol_for_listconfig(sym);
break;
case helpnewconfig:
printf("-----\n");
Expand Down
5 changes: 5 additions & 0 deletions scripts/kconfig/confdata.c
Original file line number Diff line number Diff line change
Expand Up @@ -667,6 +667,11 @@ static void print_symbol_for_autoconf(FILE *fp, struct symbol *sym)
__print_symbol(fp, sym, OUTPUT_N_NONE, true);
}

void print_symbol_for_listconfig(struct symbol *sym)
{
__print_symbol(stdout, sym, OUTPUT_N, true);
}

static void print_symbol_for_c(FILE *fp, struct symbol *sym)
{
const char *val;
Expand Down
1 change: 1 addition & 0 deletions scripts/kconfig/lkc_proto.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ extern struct symbol * symbol_hash[SYMBOL_HASHSIZE];
struct symbol * sym_lookup(const char *name, int flags);
struct symbol * sym_find(const char *name);
char *sym_escape_string_value(const char *in);
void print_symbol_for_listconfig(struct symbol *sym);
struct symbol ** sym_re_search(const char *pattern);
const char * sym_type_name(enum symbol_type type);
void sym_calc_value(struct symbol *sym);
Expand Down

0 comments on commit 51d792c

Please sign in to comment.