vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* grub-core/disk/ldm.c: Rename variables and arguments to prevent

Browse source 
shadowing.
	* grub-core/kern/disk.c: Likewise.
	* grub-core/kern/misc.c: Likewise.
	* include/grub/parser.h: Likewise.
	* include/grub/script_sh.h: Likewise.
	* include/grub/zfs/zfs.h: Likewise.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-10-18 16:54:57 +02:00
parent 7b3aca00fa
commit 3cd910a212
7 changed files with 40 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

10
include/grub/parser.h
View file

@ -62,8 +62,8 @@ EXPORT_FUNC (grub_parser_cmdline_state) (grub_parser_state_t state,
grub_err_t
EXPORT_FUNC (grub_parser_split_cmdline) (const char *cmdline,
grub_reader_getline_t getline,
void *getline_data,
grub_reader_getline_t getline_func,
void *getline_func_data,
int *argc, char ***argv);
struct grub_parser
@ -81,7 +81,8 @@ struct grub_parser
grub_err_t (*fini) (void);
grub_err_t (*parse_line) (char *line,
grub_reader_getline_t getline, void *getline_data);
grub_reader_getline_t getline_func,
void *getline_func_data);
};
typedef struct grub_parser *grub_parser_t;
@ -89,6 +90,7 @@ grub_err_t grub_parser_execute (char *source);
grub_err_t
grub_rescue_parse_line (char *line,
grub_reader_getline_t getline, void *getline_data);
grub_reader_getline_t getline_func,
void *getline_func_data);
#endif /* ! GRUB_PARSER_HEADER */

11
include/grub/script_sh.h
View file

@ -290,16 +290,16 @@ grub_script_arg_add (struct grub_parser_param *state,
grub_script_arg_type_t type, char *str);
struct grub_script *grub_script_parse (char *script,
grub_reader_getline_t getline,
void *getline_data);
grub_reader_getline_t getline_func,
void *getline_func_data);
void grub_script_free (struct grub_script *script);
struct grub_script *grub_script_create (struct grub_script_cmd *cmd,
struct grub_script_mem *mem);
struct grub_lexer_param *grub_script_lexer_init (struct grub_parser_param *parser,
char *script,
grub_reader_getline_t getline,
void *getline_data);
grub_reader_getline_t getline_func,
void *getline_func_data);
void grub_script_lexer_fini (struct grub_lexer_param *);
void grub_script_lexer_ref (struct grub_lexer_param *);
void grub_script_lexer_deref (struct grub_lexer_param *);
@ -387,7 +387,8 @@ grub_script_execute_arglist_to_argv (struct grub_script_arglist *arglist, int *c
grub_err_t
grub_normal_parse_line (char *line,
grub_reader_getline_t getline, void *getline_data);
grub_reader_getline_t getline_func,
void *getline_func_data);
static inline struct grub_script *
grub_script_ref (struct grub_script *script)

2
include/grub/zfs/zfs.h
View file

@ -131,7 +131,7 @@ int grub_zfs_nvlist_lookup_uint64 (const char *nvlist, const char *name,
grub_uint64_t *out);
char *grub_zfs_nvlist_lookup_nvlist_array (const char *nvlist,
const char *name,
grub_size_t index);
grub_size_t array_index);
int grub_zfs_nvlist_lookup_nvlist_array_get_nelm (const char *nvlist,
const char *name);
grub_err_t