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

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

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 */