kconfig: Get rid of the P() macro in headers

This was originally meant for dlopen()ing a potential kconfig shared
library. The unused dlopen code has already been removed in commit
5a6f8d2b (kconfig: nuke LKC_DIRECT_LINK cruft), so let's remove the
rest. The lkc_proto.h change was made with the following sed script:

  sed -r 's/^P\(([^,]*), *([^,]*), *(.*)\);/\2 \1\3;/'

Plus some manual adjustments.

Signed-off-by: Michal Marek <mmarek@suse.cz>
This commit is contained in:
Michal Marek 2015-01-27 17:11:42 +01:00
Родитель 4980bdf021
Коммит 70529b1a17
2 изменённых файлов: 43 добавлений и 47 удалений

Просмотреть файл

@ -21,9 +21,7 @@ static inline char *bind_textdomain_codeset(const char *dn, char *c) { return c;
extern "C" { extern "C" {
#endif #endif
#define P(name,type,arg) extern type name arg
#include "lkc_proto.h" #include "lkc_proto.h"
#undef P
#define SRCTREE "srctree" #define SRCTREE "srctree"

Просмотреть файл

@ -1,57 +1,55 @@
#include <stdarg.h> #include <stdarg.h>
/* confdata.c */ /* confdata.c */
P(conf_parse,void,(const char *name)); void conf_parse(const char *name);
P(conf_read,int,(const char *name)); int conf_read(const char *name);
P(conf_read_simple,int,(const char *name, int)); int conf_read_simple(const char *name, int);
P(conf_write_defconfig,int,(const char *name)); int conf_write_defconfig(const char *name);
P(conf_write,int,(const char *name)); int conf_write(const char *name);
P(conf_write_autoconf,int,(void)); int conf_write_autoconf(void);
P(conf_get_changed,bool,(void)); bool conf_get_changed(void);
P(conf_set_changed_callback, void,(void (*fn)(void))); void conf_set_changed_callback(void (*fn)(void));
P(conf_set_message_callback, void,(void (*fn)(const char *fmt, va_list ap))); void conf_set_message_callback(void (*fn)(const char *fmt, va_list ap));
/* menu.c */ /* menu.c */
P(rootmenu,struct menu,); extern struct menu rootmenu;
P(menu_is_empty, bool, (struct menu *menu)); bool menu_is_empty(struct menu *menu);
P(menu_is_visible, bool, (struct menu *menu)); bool menu_is_visible(struct menu *menu);
P(menu_has_prompt, bool, (struct menu *menu)); bool menu_has_prompt(struct menu *menu);
P(menu_get_prompt,const char *,(struct menu *menu)); const char * menu_get_prompt(struct menu *menu);
P(menu_get_root_menu,struct menu *,(struct menu *menu)); struct menu * menu_get_root_menu(struct menu *menu);
P(menu_get_parent_menu,struct menu *,(struct menu *menu)); struct menu * menu_get_parent_menu(struct menu *menu);
P(menu_has_help,bool,(struct menu *menu)); bool menu_has_help(struct menu *menu);
P(menu_get_help,const char *,(struct menu *menu)); const char * menu_get_help(struct menu *menu);
P(get_symbol_str, void, (struct gstr *r, struct symbol *sym, struct list_head void get_symbol_str(struct gstr *r, struct symbol *sym, struct list_head *head);
*head)); struct gstr get_relations_str(struct symbol **sym_arr, struct list_head *head);
P(get_relations_str, struct gstr, (struct symbol **sym_arr, struct list_head void menu_get_ext_help(struct menu *menu, struct gstr *help);
*head));
P(menu_get_ext_help,void,(struct menu *menu, struct gstr *help));
/* symbol.c */ /* symbol.c */
P(symbol_hash,struct symbol *,[SYMBOL_HASHSIZE]); extern struct symbol * symbol_hash[SYMBOL_HASHSIZE];
P(sym_lookup,struct symbol *,(const char *name, int flags)); struct symbol * sym_lookup(const char *name, int flags);
P(sym_find,struct symbol *,(const char *name)); struct symbol * sym_find(const char *name);
P(sym_expand_string_value,const char *,(const char *in)); const char * sym_expand_string_value(const char *in);
P(sym_escape_string_value, const char *,(const char *in)); const char * sym_escape_string_value(const char *in);
P(sym_re_search,struct symbol **,(const char *pattern)); struct symbol ** sym_re_search(const char *pattern);
P(sym_type_name,const char *,(enum symbol_type type)); const char * sym_type_name(enum symbol_type type);
P(sym_calc_value,void,(struct symbol *sym)); void sym_calc_value(struct symbol *sym);
P(sym_get_type,enum symbol_type,(struct symbol *sym)); enum symbol_type sym_get_type(struct symbol *sym);
P(sym_tristate_within_range,bool,(struct symbol *sym,tristate tri)); bool sym_tristate_within_range(struct symbol *sym,tristate tri);
P(sym_set_tristate_value,bool,(struct symbol *sym,tristate tri)); bool sym_set_tristate_value(struct symbol *sym,tristate tri);
P(sym_toggle_tristate_value,tristate,(struct symbol *sym)); tristate sym_toggle_tristate_value(struct symbol *sym);
P(sym_string_valid,bool,(struct symbol *sym, const char *newval)); bool sym_string_valid(struct symbol *sym, const char *newval);
P(sym_string_within_range,bool,(struct symbol *sym, const char *str)); bool sym_string_within_range(struct symbol *sym, const char *str);
P(sym_set_string_value,bool,(struct symbol *sym, const char *newval)); bool sym_set_string_value(struct symbol *sym, const char *newval);
P(sym_is_changable,bool,(struct symbol *sym)); bool sym_is_changable(struct symbol *sym);
P(sym_get_choice_prop,struct property *,(struct symbol *sym)); struct property * sym_get_choice_prop(struct symbol *sym);
P(sym_get_default_prop,struct property *,(struct symbol *sym)); struct property * sym_get_default_prop(struct symbol *sym);
P(sym_get_string_value,const char *,(struct symbol *sym)); const char * sym_get_string_value(struct symbol *sym);
P(prop_get_type_name,const char *,(enum prop_type type)); const char * prop_get_type_name(enum prop_type type);
/* expr.c */ /* expr.c */
P(expr_compare_type,int,(enum expr_type t1, enum expr_type t2)); int expr_compare_type(enum expr_type t1, enum expr_type t2);
P(expr_print,void,(struct expr *e, void (*fn)(void *, struct symbol *, const char *), void *data, int prevtoken)); void expr_print(struct expr *e, void (*fn)(void *, struct symbol *, const char *), void *data, int prevtoken);