kconfig: constify `kconf_id_lookup'
Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
This commit is contained in:
Родитель
58ef81c5cf
Коммит
61f956f576
|
@ -356,7 +356,7 @@ lex.%.c: %.l
|
||||||
cp $@ $@_shipped
|
cp $@ $@_shipped
|
||||||
|
|
||||||
%.hash.c: %.gperf
|
%.hash.c: %.gperf
|
||||||
gperf < $< > $@
|
gperf -C < $< > $@
|
||||||
cp $@ $@_shipped
|
cp $@ $@_shipped
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
|
|
||||||
struct kconf_id;
|
struct kconf_id;
|
||||||
|
|
||||||
static struct kconf_id *kconf_id_lookup(register const char *str, register unsigned int len);
|
static const struct kconf_id *kconf_id_lookup(register const char *str, register unsigned int len);
|
||||||
|
|
||||||
%%
|
%%
|
||||||
mainmenu, T_MAINMENU, TF_COMMAND
|
mainmenu, T_MAINMENU, TF_COMMAND
|
||||||
|
|
|
@ -96,7 +96,7 @@ n [A-Za-z0-9_]
|
||||||
|
|
||||||
<COMMAND>{
|
<COMMAND>{
|
||||||
{n}+ {
|
{n}+ {
|
||||||
struct kconf_id *id = kconf_id_lookup(yytext, yyleng);
|
const struct kconf_id *id = kconf_id_lookup(yytext, yyleng);
|
||||||
BEGIN(PARAM);
|
BEGIN(PARAM);
|
||||||
current_pos.file = current_file;
|
current_pos.file = current_file;
|
||||||
current_pos.lineno = current_file->lineno;
|
current_pos.lineno = current_file->lineno;
|
||||||
|
@ -132,7 +132,7 @@ n [A-Za-z0-9_]
|
||||||
\n BEGIN(INITIAL); current_file->lineno++; return T_EOL;
|
\n BEGIN(INITIAL); current_file->lineno++; return T_EOL;
|
||||||
--- /* ignore */
|
--- /* ignore */
|
||||||
({n}|[-/.])+ {
|
({n}|[-/.])+ {
|
||||||
struct kconf_id *id = kconf_id_lookup(yytext, yyleng);
|
const struct kconf_id *id = kconf_id_lookup(yytext, yyleng);
|
||||||
if (id && id->flags & TF_PARAM) {
|
if (id && id->flags & TF_PARAM) {
|
||||||
zconflval.id = id;
|
zconflval.id = id;
|
||||||
return id->token;
|
return id->token;
|
||||||
|
|
|
@ -25,7 +25,7 @@ extern int zconflex(void);
|
||||||
static void zconfprint(const char *err, ...);
|
static void zconfprint(const char *err, ...);
|
||||||
static void zconf_error(const char *err, ...);
|
static void zconf_error(const char *err, ...);
|
||||||
static void zconferror(const char *err);
|
static void zconferror(const char *err);
|
||||||
static bool zconf_endtoken(struct kconf_id *id, int starttoken, int endtoken);
|
static bool zconf_endtoken(const struct kconf_id *id, int starttoken, int endtoken);
|
||||||
|
|
||||||
struct symbol *symbol_hash[SYMBOL_HASHSIZE];
|
struct symbol *symbol_hash[SYMBOL_HASHSIZE];
|
||||||
|
|
||||||
|
@ -45,7 +45,7 @@ static struct menu *current_menu, *current_entry;
|
||||||
struct symbol *symbol;
|
struct symbol *symbol;
|
||||||
struct expr *expr;
|
struct expr *expr;
|
||||||
struct menu *menu;
|
struct menu *menu;
|
||||||
struct kconf_id *id;
|
const struct kconf_id *id;
|
||||||
}
|
}
|
||||||
|
|
||||||
%token <id>T_MAINMENU
|
%token <id>T_MAINMENU
|
||||||
|
@ -229,7 +229,7 @@ symbol_option_list:
|
||||||
/* empty */
|
/* empty */
|
||||||
| symbol_option_list T_WORD symbol_option_arg
|
| symbol_option_list T_WORD symbol_option_arg
|
||||||
{
|
{
|
||||||
struct kconf_id *id = kconf_id_lookup($2, strlen($2));
|
const struct kconf_id *id = kconf_id_lookup($2, strlen($2));
|
||||||
if (id && id->flags & TF_OPTION)
|
if (id && id->flags & TF_OPTION)
|
||||||
menu_add_option(id->token, $3);
|
menu_add_option(id->token, $3);
|
||||||
else
|
else
|
||||||
|
@ -545,7 +545,7 @@ static const char *zconf_tokenname(int token)
|
||||||
return "<token>";
|
return "<token>";
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool zconf_endtoken(struct kconf_id *id, int starttoken, int endtoken)
|
static bool zconf_endtoken(const struct kconf_id *id, int starttoken, int endtoken)
|
||||||
{
|
{
|
||||||
if (id->token != endtoken) {
|
if (id->token != endtoken) {
|
||||||
zconf_error("unexpected '%s' within %s block",
|
zconf_error("unexpected '%s' within %s block",
|
||||||
|
|
Загрузка…
Ссылка в новой задаче