2005-11-22 Hollis Blanchard <hollis@penguinppc.org>
* term/tparm.c (get_space): Remove empty `if' statement. * fs/ufs.c (grub_ufs_find_file): Remove `grub_le_to_cpu32'. * kern/parser.c (check_varstate): Rename `state' to 's'.
This commit is contained in:
parent
aeaf81d9a3
commit
9c12956b84
4 changed files with 16 additions and 10 deletions
|
@ -1,3 +1,11 @@
|
||||||
|
2005-11-22 Hollis Blanchard <hollis@penguinppc.org>
|
||||||
|
|
||||||
|
* term/tparm.c (get_space): Remove empty `if' statement.
|
||||||
|
|
||||||
|
* fs/ufs.c (grub_ufs_find_file): Remove `grub_le_to_cpu32'.
|
||||||
|
|
||||||
|
* kern/parser.c (check_varstate): Rename `state' to 's'.
|
||||||
|
|
||||||
2005-11-22 Hollis Blanchard <hollis@penguinppc.org>
|
2005-11-22 Hollis Blanchard <hollis@penguinppc.org>
|
||||||
|
|
||||||
* partmap/acorn.c: Change `unsigned' to `unsigned int'. Move all
|
* partmap/acorn.c: Change `unsigned' to `unsigned int'. Move all
|
||||||
|
|
2
fs/ufs.c
2
fs/ufs.c
|
@ -471,7 +471,7 @@ grub_ufs_find_file (struct grub_ufs_data *data, const char *path)
|
||||||
}
|
}
|
||||||
|
|
||||||
pos += grub_le_to_cpu16 (dirent.direntlen);
|
pos += grub_le_to_cpu16 (dirent.direntlen);
|
||||||
} while (pos < grub_le_to_cpu32 (INODE_SIZE (data)));
|
} while (pos < INODE_SIZE (data));
|
||||||
|
|
||||||
grub_error (GRUB_ERR_FILE_NOT_FOUND, "file not found");
|
grub_error (GRUB_ERR_FILE_NOT_FOUND, "file not found");
|
||||||
return grub_errno;
|
return grub_errno;
|
||||||
|
|
|
@ -115,14 +115,14 @@ grub_parser_split_cmdline (const char *cmdline, grub_err_t (*getline) (char **),
|
||||||
char *args;
|
char *args;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
auto int check_varstate (grub_parser_state_t state);
|
auto int check_varstate (grub_parser_state_t s);
|
||||||
|
|
||||||
int check_varstate (grub_parser_state_t state)
|
int check_varstate (grub_parser_state_t s)
|
||||||
{
|
{
|
||||||
return (state == GRUB_PARSER_STATE_VARNAME
|
return (s == GRUB_PARSER_STATE_VARNAME
|
||||||
|| state == GRUB_PARSER_STATE_VARNAME2
|
|| s == GRUB_PARSER_STATE_VARNAME2
|
||||||
|| state == GRUB_PARSER_STATE_QVARNAME
|
|| s == GRUB_PARSER_STATE_QVARNAME
|
||||||
|| state == GRUB_PARSER_STATE_QVARNAME2);
|
|| s == GRUB_PARSER_STATE_QVARNAME2);
|
||||||
}
|
}
|
||||||
|
|
||||||
auto void add_var (grub_parser_state_t newstate);
|
auto void add_var (grub_parser_state_t newstate);
|
||||||
|
|
|
@ -164,9 +164,7 @@ get_space(grub_size_t need)
|
||||||
if (need > out_size) {
|
if (need > out_size) {
|
||||||
out_size = need * 2;
|
out_size = need * 2;
|
||||||
out_buff = grub_realloc(out_buff, out_size*sizeof(char));
|
out_buff = grub_realloc(out_buff, out_size*sizeof(char));
|
||||||
if (out_buff == 0)
|
/* FIX ME! handle out_buff == 0. */
|
||||||
// FIX ME! OOM, what now?
|
|
||||||
;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue