ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "init: limit visibility of init_parser.c helpers"

Browse source
This commit is contained in:
Greg Hackmann 2013-11-26 20:58:43 +00:00 • committed by Gerrit Code Review
commit 0914e01ed9
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
init/init_parser.c
View file

@ -60,7 +60,7 @@ static void parse_line_action(struct parse_state *state, int nargs, char **args)
#define KEYWORD(symbol, flags, nargs, func) \ #define KEYWORD(symbol, flags, nargs, func) \
[ K_##symbol ] = { #symbol, func, nargs + 1, flags, }, [ K_##symbol ] = { #symbol, func, nargs + 1, flags, },
struct { static struct {
const char *name; const char *name;
int (*func)(int nargs, char **args); int (*func)(int nargs, char **args);
unsigned char nargs; unsigned char nargs;
@ -76,7 +76,7 @@ struct {
#define kw_func(kw) (keyword_info[kw].func) #define kw_func(kw) (keyword_info[kw].func)
#define kw_nargs(kw) (keyword_info[kw].nargs) #define kw_nargs(kw) (keyword_info[kw].nargs)
int lookup_keyword(const char *s) static int lookup_keyword(const char *s)
{ {
switch (*s++) { switch (*s++) {
case 'c': case 'c':
@ -170,7 +170,7 @@ int lookup_keyword(const char *s)
return K_UNKNOWN; return K_UNKNOWN;
} }
void parse_line_no_op(struct parse_state *state, int nargs, char **args) static void parse_line_no_op(struct parse_state *state, int nargs, char **args)
{ {
} }
@ -293,7 +293,7 @@ err:
return -1; return -1;
} }
void parse_import(struct parse_state *state, int nargs, char **args) static void parse_import(struct parse_state *state, int nargs, char **args)
{ {
struct listnode *import_list = state->priv; struct listnode *import_list = state->priv;
struct import *import; struct import *import;
@ -318,7 +318,7 @@ void parse_import(struct parse_state *state, int nargs, char **args)
INFO("found import '%s', adding to import list", import->filename); INFO("found import '%s', adding to import list", import->filename);
} }
void parse_new_section(struct parse_state *state, int kw, static void parse_new_section(struct parse_state *state, int kw,
int nargs, char **args) int nargs, char **args)
{ {
printf("[ %s %s ]\n", args[0], printf("[ %s %s ]\n", args[0],

1
init/parser.h
View file

@ -33,7 +33,6 @@ struct parse_state
void *priv; void *priv;
}; };
int lookup_keyword(const char *s);
void DUMP(void); void DUMP(void);
int next_token(struct parse_state *state); int next_token(struct parse_state *state);
void parse_error(struct parse_state *state, const char *fmt, ...); void parse_error(struct parse_state *state, const char *fmt, ...);