Commit 6425e3b2 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

kconfig: add const qualifiers to several function arguments 



Clarify that the given structures are not modified.

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
parent 8bfd6f09

scripts/kconfig/expr.c

+2 −2
Original line number Diff line number Diff line
@@ -1096,7 +1096,7 @@ static int expr_compare_type(enum expr_type t1, enum expr_type t2) 
	return 0;

}



void expr_print(struct expr *e,

void expr_print(const struct expr *e,

		void (*fn)(void *, struct symbol *, const char *),

		void *data, int prevtoken)

{
@@ -1221,7 +1221,7 @@ static void expr_print_gstr_helper(void *data, struct symbol *sym, const char *s 
		str_printf(gs, " [=%s]", sym_str);

}



void expr_gstr_print(struct expr *e, struct gstr *gs)

void expr_gstr_print(const struct expr *e, struct gstr *gs)

{

	expr_print(e, expr_print_gstr_helper, gs, E_NONE);

}

scripts/kconfig/expr.h

+2 −2
Original line number Diff line number Diff line
@@ -291,11 +291,11 @@ struct expr *expr_trans_compare(struct expr *e, enum expr_type type, struct symb 


void expr_fprint(struct expr *e, FILE *out);

struct gstr; /* forward */

void expr_gstr_print(struct expr *e, struct gstr *gs);

void expr_gstr_print(const struct expr *e, struct gstr *gs);

void expr_gstr_print_revdep(struct expr *e, struct gstr *gs,

			    tristate pr_type, const char *title);



static inline int expr_is_yes(struct expr *e)

static inline int expr_is_yes(const struct expr *e)

{

	return !e || (e->type == E_SYMBOL && e->left.sym == &symbol_yes);

}

scripts/kconfig/lkc.h

+11 −10
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ struct gstr str_new(void); 
void str_free(struct gstr *gs);

void str_append(struct gstr *gs, const char *s);

void str_printf(struct gstr *gs, const char *fmt, ...);

char *str_get(struct gstr *gs);

char *str_get(const struct gstr *gs);



/* menu.c */

struct menu *menu_next(struct menu *menu, struct menu *root);
@@ -84,13 +84,14 @@ struct menu *menu_next(struct menu *menu, struct menu *root); 
#define menu_for_each_entry(menu) \

	menu_for_each_sub_entry(menu, &rootmenu)

void _menu_init(void);

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

void menu_warn(const 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);

struct property *menu_add_prompt(enum prop_type type, const 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_finalize(void);
@@ -100,8 +101,8 @@ 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);

bool menu_has_prompt(const struct menu *menu);

const char *menu_get_prompt(const struct menu *menu);

struct menu *menu_get_parent_menu(struct menu *menu);

int get_jump_key_char(void);

struct gstr get_relations_str(struct symbol **sym_arr, struct list_head *head);
@@ -114,25 +115,25 @@ struct symbol *sym_calc_choice(struct menu *choice); 
struct property *sym_get_range_prop(struct symbol *sym);

const char *sym_get_string_default(struct symbol *sym);

struct symbol *sym_check_deps(struct symbol *sym);

struct symbol *prop_get_symbol(struct property *prop);

struct symbol *prop_get_symbol(const struct property *prop);



static inline tristate sym_get_tristate_value(struct symbol *sym)

static inline tristate sym_get_tristate_value(const struct symbol *sym)

{

	return sym->curr.tri;

}



static inline bool sym_is_choice(struct symbol *sym)

static inline bool sym_is_choice(const struct symbol *sym)

{

	/* A choice is a symbol with no name */

	return sym->name == NULL;

}



static inline bool sym_is_choice_value(struct symbol *sym)

static inline bool sym_is_choice_value(const struct symbol *sym)

{

	return sym->flags & SYMBOL_CHOICEVAL ? true : false;

}



static inline bool sym_has_value(struct symbol *sym)

static inline bool sym_has_value(const struct symbol *sym)

{

	return sym->flags & SYMBOL_DEF_USER ? true : false;

}

scripts/kconfig/lkc_proto.h

+7 −5
Original line number Diff line number Diff line
@@ -25,21 +25,23 @@ struct symbol ** sym_re_search(const char *pattern); 
const char * sym_type_name(enum symbol_type type);

void sym_calc_value(struct symbol *sym);

bool sym_dep_errors(void);

enum symbol_type sym_get_type(struct symbol *sym);

bool sym_tristate_within_range(struct symbol *sym,tristate tri);

enum symbol_type sym_get_type(const struct symbol *sym);

bool sym_tristate_within_range(const struct symbol *sym, tristate tri);

bool sym_set_tristate_value(struct symbol *sym,tristate tri);

void choice_set_value(struct menu *choice, struct symbol *sym);

tristate sym_toggle_tristate_value(struct symbol *sym);

bool sym_string_valid(struct symbol *sym, const char *newval);

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_changeable(struct symbol *sym);

struct menu *sym_get_choice_menu(struct symbol *sym);

bool sym_is_changeable(const struct symbol *sym);

struct menu *sym_get_choice_menu(const struct symbol *sym);

const char * sym_get_string_value(struct symbol *sym);



const char * prop_get_type_name(enum prop_type type);



/* expr.c */

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

void expr_print(const struct expr *e,

		void (*fn)(void *, struct symbol *, const char *),

		void *data, int prevtoken);



#endif /* LKC_PROTO_H */

scripts/kconfig/menu.c

+8 −7
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ struct menu *menu_next(struct menu *menu, struct menu *root) 
	return menu->next;

}



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

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

{

	va_list ap;

	va_start(ap, fmt);
@@ -48,7 +48,7 @@ void menu_warn(struct menu *menu, const char *fmt, ...) 
	va_end(ap);

}



static void prop_warn(struct property *prop, const char *fmt, ...)

static void prop_warn(const struct property *prop, const char *fmt, ...)

{

	va_list ap;

	va_start(ap, fmt);
@@ -175,7 +175,7 @@ static struct property *menu_add_prop(enum prop_type type, struct expr *expr, 
	return prop;

}



struct property *menu_add_prompt(enum prop_type type, char *prompt,

struct property *menu_add_prompt(enum prop_type type, const char *prompt,

				 struct expr *dep)

{

	struct property *prop = menu_add_prop(type, NULL, dep);
@@ -527,7 +527,7 @@ void menu_finalize(void) 
	_menu_finalize(&rootmenu, false);

}



bool menu_has_prompt(struct menu *menu)

bool menu_has_prompt(const struct menu *menu)

{

	if (!menu->prompt)

		return false;
@@ -573,7 +573,7 @@ bool menu_is_visible(struct menu *menu) 
	return visible != no;

}



const char *menu_get_prompt(struct menu *menu)

const char *menu_get_prompt(const struct menu *menu)

{

	if (menu->prompt)

		return menu->prompt->text;
@@ -594,13 +594,14 @@ struct menu *menu_get_parent_menu(struct menu *menu) 
	return menu;

}



static void get_def_str(struct gstr *r, struct menu *menu)

static void get_def_str(struct gstr *r, const struct menu *menu)

{

	str_printf(r, "Defined at %s:%d\n",

		   menu->filename, menu->lineno);

}



static void get_dep_str(struct gstr *r, struct expr *expr, const char *prefix)

static void get_dep_str(struct gstr *r, const struct expr *expr,

			const char *prefix)

{

	if (!expr_is_yes(expr)) {

		str_append(r, prefix);