Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad8d40cd authored by Michal Marek's avatar Michal Marek
Browse files

kconfig: Remove unnecessary prototypes from headers 



Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
parent 46315744

scripts/kconfig/confdata.c

+5 −0
Original line number Diff line number Diff line
@@ -16,6 +16,11 @@ 


#include "lkc.h"



struct conf_printer {

	void (*print_symbol)(FILE *, struct symbol *, const char *, void *);

	void (*print_comment)(FILE *, const char *, void *);

};



static void conf_warning(const char *fmt, ...)

	__attribute__ ((format (printf, 1, 2)));

scripts/kconfig/expr.c

+12 −6
Original line number Diff line number Diff line
@@ -11,6 +11,12 @@ 


#define DEBUG_EXPR	0



static int expr_eq(struct expr *e1, struct expr *e2);

static struct expr *expr_eliminate_yn(struct expr *e);

static struct expr *expr_extract_eq_and(struct expr **ep1, struct expr **ep2);

static struct expr *expr_extract_eq_or(struct expr **ep1, struct expr **ep2);

static void expr_extract_eq(enum expr_type type, struct expr **ep, struct expr **ep1, struct expr **ep2);



struct expr *expr_alloc_symbol(struct symbol *sym)

{

	struct expr *e = xcalloc(1, sizeof(*e));
@@ -186,7 +192,7 @@ void expr_eliminate_eq(struct expr **ep1, struct expr **ep2) 
#undef e1

#undef e2



int expr_eq(struct expr *e1, struct expr *e2)

static int expr_eq(struct expr *e1, struct expr *e2)

{

	int res, old_count;
@@ -228,7 +234,7 @@ int expr_eq(struct expr *e1, struct expr *e2) 
	return 0;

}



struct expr *expr_eliminate_yn(struct expr *e)

static struct expr *expr_eliminate_yn(struct expr *e)

{

	struct expr *tmp;
@@ -823,7 +829,7 @@ bool expr_depends_symbol(struct expr *dep, struct symbol *sym) 
 	return false;

}



struct expr *expr_extract_eq_and(struct expr **ep1, struct expr **ep2)

static struct expr *expr_extract_eq_and(struct expr **ep1, struct expr **ep2)

{

	struct expr *tmp = NULL;

	expr_extract_eq(E_AND, &tmp, ep1, ep2);
@@ -834,7 +840,7 @@ struct expr *expr_extract_eq_and(struct expr **ep1, struct expr **ep2) 
	return tmp;

}



struct expr *expr_extract_eq_or(struct expr **ep1, struct expr **ep2)

static struct expr *expr_extract_eq_or(struct expr **ep1, struct expr **ep2)

{

	struct expr *tmp = NULL;

	expr_extract_eq(E_OR, &tmp, ep1, ep2);
@@ -845,7 +851,7 @@ struct expr *expr_extract_eq_or(struct expr **ep1, struct expr **ep2) 
	return tmp;

}



void expr_extract_eq(enum expr_type type, struct expr **ep, struct expr **ep1, struct expr **ep2)

static void expr_extract_eq(enum expr_type type, struct expr **ep, struct expr **ep1, struct expr **ep2)

{

#define e1 (*ep1)

#define e2 (*ep2)
@@ -976,7 +982,7 @@ tristate expr_calc_value(struct expr *e) 
	}

}



int expr_compare_type(enum expr_type t1, enum expr_type t2)

static int expr_compare_type(enum expr_type t1, enum expr_type t2)

{

	if (t1 == t2)

		return 0;

scripts/kconfig/expr.h

+0 −5
Original line number Diff line number Diff line
@@ -205,18 +205,13 @@ struct expr *expr_alloc_and(struct expr *e1, struct expr *e2); 
struct expr *expr_alloc_or(struct expr *e1, struct expr *e2);

struct expr *expr_copy(const struct expr *org);

void expr_free(struct expr *e);

int expr_eq(struct expr *e1, struct expr *e2);

void expr_eliminate_eq(struct expr **ep1, struct expr **ep2);

tristate expr_calc_value(struct expr *e);

struct expr *expr_eliminate_yn(struct expr *e);

struct expr *expr_trans_bool(struct expr *e);

struct expr *expr_eliminate_dups(struct expr *e);

struct expr *expr_transform(struct expr *e);

int expr_contains_symbol(struct expr *dep, struct symbol *sym);

bool expr_depends_symbol(struct expr *dep, struct symbol *sym);

struct expr *expr_extract_eq_and(struct expr **ep1, struct expr **ep2);

struct expr *expr_extract_eq_or(struct expr **ep1, struct expr **ep2);

void expr_extract_eq(enum expr_type type, struct expr **ep, struct expr **ep1, struct expr **ep2);

struct expr *expr_trans_compare(struct expr *e, enum expr_type type, struct symbol *sym);

struct expr *expr_simplify_unmet_dep(struct expr *e1, struct expr *e2);

scripts/kconfig/lkc.h

+0 −11
Original line number Diff line number Diff line
@@ -68,9 +68,6 @@ struct kconf_id { 
	enum symbol_type stype;

};



extern int zconfdebug;



int zconfparse(void);

void zconfdump(FILE *out);

void zconf_starthelp(void);

FILE *zconf_fopen(const char *name);
@@ -88,11 +85,6 @@ void sym_add_change_count(int count); 
bool conf_set_all_new_symbols(enum conf_def_mode mode);

void set_all_choice_values(struct symbol *csym);



struct conf_printer {

	void (*print_symbol)(FILE *, struct symbol *, const char *, void *);

	void (*print_comment)(FILE *, const char *, void *);

};



/* confdata.c and expr.c */

static inline void xfwrite(const void *str, size_t len, size_t count, FILE *out)

{
@@ -111,7 +103,6 @@ void menu_add_entry(struct symbol *sym); 
void menu_end_entry(void);

void menu_add_dep(struct expr *dep);

void menu_add_visibility(struct expr *dep);

struct property *menu_add_prop(enum prop_type type, char *prompt, struct expr *expr, 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);
@@ -145,8 +136,6 @@ extern struct expr *sym_env_list; 


void sym_init(void);

void sym_clear_all_valid(void);

void sym_set_all_changed(void);

void sym_set_changed(struct symbol *sym);

struct symbol *sym_choice_default(struct symbol *sym);

const char *sym_get_string_default(struct symbol *sym);

struct symbol *sym_check_deps(struct symbol *sym);

scripts/kconfig/lkc_proto.h

+0 −3
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 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);

void get_symbol_str(struct gstr *r, struct symbol *sym, struct list_head *head);

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

void menu_get_ext_help(struct menu *menu, struct gstr *help);
@@ -45,11 +44,9 @@ bool sym_string_within_range(struct symbol *sym, const char *str); 
bool sym_set_string_value(struct symbol *sym, const char *newval);

bool sym_is_changable(struct symbol *sym);

struct property * sym_get_choice_prop(struct symbol *sym);

struct property * sym_get_default_prop(struct symbol *sym);

const char * sym_get_string_value(struct symbol *sym);



const char * prop_get_type_name(enum prop_type type);



/* expr.c */

int expr_compare_type(enum expr_type t1, enum expr_type t2);

void expr_print(struct expr *e, void (*fn)(void *, struct symbol *, const char *), void *data, int prevtoken);