Commit 19b835a5 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

kconfig: qconf: fix incomplete type 'struct gstr' warning 



"make HOSTCXX=clang++ xconfig" reports the following:

  HOSTCXX scripts/kconfig/qconf.o
In file included from scripts/kconfig/qconf.cc:23:
In file included from scripts/kconfig/lkc.h:15:
scripts/kconfig/lkc_proto.h:26:13: warning: 'get_relations_str' has C-linkage specified, but returns incomplete type 'struct gstr' which could be incompatible with C [-Wreturn-type-c-linkage]
struct gstr get_relations_str(struct symbol **sym_arr, struct list_head *head);
            ^

Currently, get_relations_str() is declared before the struct gstr
definition.

Move all declarations of menu.c functions below.

BTW, some are declared in lkc.h and some in lkc_proto.h, but the
difference is unclear. I guess some refactoring is needed.

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Acked-by: default avatarBoris Kolpackov <boris@codesynthesis.com>
parent a608b6a6

scripts/kconfig/lkc.h

+30 −17
Original line number Diff line number Diff line
@@ -66,23 +66,6 @@ static inline void xfwrite(const void *str, size_t len, size_t count, FILE *out) 
		fprintf(stderr, "Error in writing or end of file.\n");

}



/* menu.c */

void _menu_init(void);

void menu_warn(struct menu *menu, const char *fmt, ...);

struct menu *menu_add_menu(void);

void menu_end_menu(void);

void menu_add_entry(struct symbol *sym);

void menu_add_dep(struct expr *dep);

void menu_add_visibility(struct expr *dep);

struct property *menu_add_prompt(enum prop_type type, char *prompt, struct expr *dep);

void menu_add_expr(enum prop_type type, struct expr *expr, struct expr *dep);

void menu_add_symbol(enum prop_type type, struct symbol *sym, struct expr *dep);

void menu_add_option_modules(void);

void menu_add_option_defconfig_list(void);

void menu_add_option_allnoconfig_y(void);

void menu_finalize(struct menu *parent);

void menu_set_type(int type);



/* util.c */

struct file *file_lookup(const char *name);

void *xmalloc(size_t size);
@@ -109,6 +92,36 @@ void str_append(struct gstr *gs, const char *s); 
void str_printf(struct gstr *gs, const char *fmt, ...);

const char *str_get(struct gstr *gs);



/* menu.c */

void _menu_init(void);

void menu_warn(struct menu *menu, const char *fmt, ...);

struct menu *menu_add_menu(void);

void menu_end_menu(void);

void menu_add_entry(struct symbol *sym);

void menu_add_dep(struct expr *dep);

void menu_add_visibility(struct expr *dep);

struct property *menu_add_prompt(enum prop_type type, char *prompt, struct expr *dep);

void menu_add_expr(enum prop_type type, struct expr *expr, struct expr *dep);

void menu_add_symbol(enum prop_type type, struct symbol *sym, struct expr *dep);

void menu_add_option_modules(void);

void menu_add_option_defconfig_list(void);

void menu_add_option_allnoconfig_y(void);

void menu_finalize(struct menu *parent);

void menu_set_type(int type);



extern struct menu rootmenu;



bool menu_is_empty(struct menu *menu);

bool menu_is_visible(struct menu *menu);

bool menu_has_prompt(struct menu *menu);

const char *menu_get_prompt(struct menu *menu);

struct menu *menu_get_root_menu(struct menu *menu);

struct menu *menu_get_parent_menu(struct menu *menu);

bool menu_has_help(struct menu *menu);

const char *menu_get_help(struct menu *menu);

struct gstr get_relations_str(struct symbol **sym_arr, struct list_head *head);

void menu_get_ext_help(struct menu *menu, struct gstr *help);



/* symbol.c */

void sym_clear_all_valid(void);

struct symbol *sym_choice_default(struct symbol *sym);

scripts/kconfig/lkc_proto.h

+0 −14
Original line number Diff line number Diff line
@@ -12,20 +12,6 @@ bool conf_get_changed(void); 
void conf_set_changed_callback(void (*fn)(void));

void conf_set_message_callback(void (*fn)(const char *s));



/* menu.c */

extern struct menu rootmenu;



bool menu_is_empty(struct menu *menu);

bool menu_is_visible(struct menu *menu);

bool menu_has_prompt(struct menu *menu);

const char * menu_get_prompt(struct menu *menu);

struct menu * menu_get_root_menu(struct menu *menu);

struct menu * menu_get_parent_menu(struct menu *menu);

bool menu_has_help(struct menu *menu);

const char * menu_get_help(struct menu *menu);

struct gstr get_relations_str(struct symbol **sym_arr, struct list_head *head);

void menu_get_ext_help(struct menu *menu, struct gstr *help);



/* symbol.c */

extern struct symbol * symbol_hash[SYMBOL_HASHSIZE];

CRA Git | Maintained and supported by SUSTech CRA and CCSE