2009-07-19 Vladimir Serbinenko <phcoder@gmail.com>
* disk/usbms.c (grub_usbms_transfer): Fix double semicolon. * fs/xfs.c (grub_xfs_dir): Likewise. * fs/afs.c (grub_afs_dir): Likewise. * fs/iso9660.c (grub_iso9660_iterate_dir): Likewise. (grub_iso9660_open): Likewise. * fs/jfs.c (grub_jfs_open): Likewise. * fs/ext2.c (grub_ext2_dir): Likewise. * include/grub/macho.h (grub_macho_fat_arch): Likewise. * script/sh/lexer.c (grub_script_yylex): Likewise.
This commit is contained in:
parent
d283815647
commit
ac70fa32dd
9 changed files with 21 additions and 9 deletions
12
ChangeLog
12
ChangeLog
|
@ -1,3 +1,15 @@
|
||||||
|
2009-07-19 Vladimir Serbinenko <phcoder@gmail.com>
|
||||||
|
|
||||||
|
* disk/usbms.c (grub_usbms_transfer): Fix double semicolon.
|
||||||
|
* fs/xfs.c (grub_xfs_dir): Likewise.
|
||||||
|
* fs/afs.c (grub_afs_dir): Likewise.
|
||||||
|
* fs/iso9660.c (grub_iso9660_iterate_dir): Likewise.
|
||||||
|
(grub_iso9660_open): Likewise.
|
||||||
|
* fs/jfs.c (grub_jfs_open): Likewise.
|
||||||
|
* fs/ext2.c (grub_ext2_dir): Likewise.
|
||||||
|
* include/grub/macho.h (grub_macho_fat_arch): Likewise.
|
||||||
|
* script/sh/lexer.c (grub_script_yylex): Likewise.
|
||||||
|
|
||||||
2009-07-16 Pavel Roskin <proski@gnu.org>
|
2009-07-16 Pavel Roskin <proski@gnu.org>
|
||||||
|
|
||||||
* configure.ac: Never add "-c" to CFLAGS.
|
* configure.ac: Never add "-c" to CFLAGS.
|
||||||
|
|
|
@ -247,7 +247,7 @@ grub_usbms_transfer (struct grub_scsi *scsi, grub_size_t cmdsize, char *cmd,
|
||||||
grub_usb_clear_halt (dev->dev, dev->out->endp_addr);
|
grub_usb_clear_halt (dev->dev, dev->out->endp_addr);
|
||||||
goto retry;
|
goto retry;
|
||||||
}
|
}
|
||||||
return grub_error (GRUB_ERR_IO, "USB Mass Storage request failed");;
|
return grub_error (GRUB_ERR_IO, "USB Mass Storage request failed");
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Read/write the data. */
|
/* Read/write the data. */
|
||||||
|
|
2
fs/afs.c
2
fs/afs.c
|
@ -557,7 +557,7 @@ grub_afs_dir (grub_device_t device, const char *path,
|
||||||
int (*hook) (const char *filename,
|
int (*hook) (const char *filename,
|
||||||
const struct grub_dirhook_info *info))
|
const struct grub_dirhook_info *info))
|
||||||
{
|
{
|
||||||
struct grub_afs_data *data = 0;;
|
struct grub_afs_data *data = 0;
|
||||||
struct grub_fshelp_node *fdiro = 0;
|
struct grub_fshelp_node *fdiro = 0;
|
||||||
|
|
||||||
auto int NESTED_FUNC_ATTR iterate (const char *filename,
|
auto int NESTED_FUNC_ATTR iterate (const char *filename,
|
||||||
|
|
|
@ -786,7 +786,7 @@ grub_ext2_dir (grub_device_t device, const char *path,
|
||||||
int (*hook) (const char *filename,
|
int (*hook) (const char *filename,
|
||||||
const struct grub_dirhook_info *info))
|
const struct grub_dirhook_info *info))
|
||||||
{
|
{
|
||||||
struct grub_ext2_data *data = 0;;
|
struct grub_ext2_data *data = 0;
|
||||||
struct grub_fshelp_node *fdiro = 0;
|
struct grub_fshelp_node *fdiro = 0;
|
||||||
|
|
||||||
auto int NESTED_FUNC_ATTR iterate (const char *filename,
|
auto int NESTED_FUNC_ATTR iterate (const char *filename,
|
||||||
|
|
|
@ -562,7 +562,7 @@ grub_iso9660_iterate_dir (grub_fshelp_node_t dir,
|
||||||
int nameoffset = offset + sizeof (dirent);
|
int nameoffset = offset + sizeof (dirent);
|
||||||
struct grub_fshelp_node *node;
|
struct grub_fshelp_node *node;
|
||||||
int sua_off = (sizeof (dirent) + dirent.namelen + 1
|
int sua_off = (sizeof (dirent) + dirent.namelen + 1
|
||||||
- (dirent.namelen % 2));;
|
- (dirent.namelen % 2));
|
||||||
int sua_size = dirent.len - sua_off;
|
int sua_size = dirent.len - sua_off;
|
||||||
|
|
||||||
sua_off += offset + dir->data->susp_skip;
|
sua_off += offset + dir->data->susp_skip;
|
||||||
|
@ -756,7 +756,7 @@ grub_iso9660_open (struct grub_file *file, const char *name)
|
||||||
|
|
||||||
grub_free (data);
|
grub_free (data);
|
||||||
|
|
||||||
return grub_errno;;
|
return grub_errno;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
2
fs/jfs.c
2
fs/jfs.c
|
@ -808,7 +808,7 @@ grub_jfs_open (struct grub_file *file, const char *name)
|
||||||
|
|
||||||
grub_free (data);
|
grub_free (data);
|
||||||
|
|
||||||
return grub_errno;;
|
return grub_errno;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
2
fs/xfs.c
2
fs/xfs.c
|
@ -621,7 +621,7 @@ grub_xfs_dir (grub_device_t device, const char *path,
|
||||||
int (*hook) (const char *filename,
|
int (*hook) (const char *filename,
|
||||||
const struct grub_dirhook_info *info))
|
const struct grub_dirhook_info *info))
|
||||||
{
|
{
|
||||||
struct grub_xfs_data *data = 0;;
|
struct grub_xfs_data *data = 0;
|
||||||
struct grub_fshelp_node *fdiro = 0;
|
struct grub_fshelp_node *fdiro = 0;
|
||||||
|
|
||||||
auto int NESTED_FUNC_ATTR iterate (const char *filename,
|
auto int NESTED_FUNC_ATTR iterate (const char *filename,
|
||||||
|
|
|
@ -39,7 +39,7 @@ struct grub_macho_fat_arch
|
||||||
grub_uint32_t offset;
|
grub_uint32_t offset;
|
||||||
grub_uint32_t size;
|
grub_uint32_t size;
|
||||||
grub_uint32_t align;
|
grub_uint32_t align;
|
||||||
} __attribute__ ((packed));;
|
} __attribute__ ((packed));
|
||||||
|
|
||||||
/* File header for 32-bit. Always in native-endian. */
|
/* File header for 32-bit. Always in native-endian. */
|
||||||
struct grub_macho_header32
|
struct grub_macho_header32
|
||||||
|
|
|
@ -246,7 +246,7 @@ grub_script_yylex (union YYSTYPE *yylval, struct grub_parser_param *parsestate)
|
||||||
{
|
{
|
||||||
char c;
|
char c;
|
||||||
grub_dprintf ("scripting", "token=`%c'\n", *state->script);
|
grub_dprintf ("scripting", "token=`%c'\n", *state->script);
|
||||||
c = *state->script;;
|
c = *state->script;
|
||||||
nextchar (state);
|
nextchar (state);
|
||||||
state->tokenonhold = c;
|
state->tokenonhold = c;
|
||||||
doexit = 1;
|
doexit = 1;
|
||||||
|
|
Loading…
Reference in a new issue