* include/grub/file.h (not_easly_seekable): Rename to ...
(not_easily_seekable): ... this. Update all users.
This commit is contained in:
parent
800f188183
commit
7e735e4349
6 changed files with 12 additions and 7 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
2011-02-08 Colin Watson <cjwatson@ubuntu.com>
|
||||||
|
|
||||||
|
* include/grub/file.h (not_easly_seekable): Rename to ...
|
||||||
|
(not_easily_seekable): ... this. Update all users.
|
||||||
|
|
||||||
2011-01-28 Colin Watson <cjwatson@ubuntu.com>
|
2011-01-28 Colin Watson <cjwatson@ubuntu.com>
|
||||||
|
|
||||||
* docs/grub.texi (Making a GRUB bootable CD-ROM): Update to describe
|
* docs/grub.texi (Making a GRUB bootable CD-ROM): Update to describe
|
||||||
|
|
|
@ -281,7 +281,7 @@ grub_pxefs_open (struct grub_file *file, const char *name)
|
||||||
}
|
}
|
||||||
|
|
||||||
file->data = data;
|
file->data = data;
|
||||||
file->not_easly_seekable = 1;
|
file->not_easily_seekable = 1;
|
||||||
grub_memcpy (file_int, file, sizeof (struct grub_file));
|
grub_memcpy (file_int, file, sizeof (struct grub_file));
|
||||||
curr_file = file_int;
|
curr_file = file_int;
|
||||||
|
|
||||||
|
|
|
@ -74,7 +74,7 @@ grub_bufio_open (grub_file_t io, int size)
|
||||||
file->data = bufio;
|
file->data = bufio;
|
||||||
file->read_hook = 0;
|
file->read_hook = 0;
|
||||||
file->fs = &grub_bufio_fs;
|
file->fs = &grub_bufio_fs;
|
||||||
file->not_easly_seekable = io->not_easly_seekable;
|
file->not_easily_seekable = io->not_easily_seekable;
|
||||||
|
|
||||||
return file;
|
return file;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1136,7 +1136,7 @@ grub_gzio_open (grub_file_t io)
|
||||||
file->data = gzio;
|
file->data = gzio;
|
||||||
file->read_hook = 0;
|
file->read_hook = 0;
|
||||||
file->fs = &grub_gzio_fs;
|
file->fs = &grub_gzio_fs;
|
||||||
file->not_easly_seekable = 1;
|
file->not_easily_seekable = 1;
|
||||||
|
|
||||||
if (! test_header (file))
|
if (! test_header (file))
|
||||||
{
|
{
|
||||||
|
|
|
@ -200,7 +200,7 @@ grub_xzio_open (grub_file_t io)
|
||||||
file->read_hook = 0;
|
file->read_hook = 0;
|
||||||
file->fs = &grub_xzio_fs;
|
file->fs = &grub_xzio_fs;
|
||||||
file->size = GRUB_FILE_SIZE_UNKNOWN;
|
file->size = GRUB_FILE_SIZE_UNKNOWN;
|
||||||
file->not_easly_seekable = 1;
|
file->not_easily_seekable = 1;
|
||||||
|
|
||||||
if (grub_file_tell (xzio->file) != 0)
|
if (grub_file_tell (xzio->file) != 0)
|
||||||
grub_file_seek (xzio->file, 0);
|
grub_file_seek (xzio->file, 0);
|
||||||
|
|
|
@ -39,8 +39,8 @@ struct grub_file
|
||||||
/* The file size. */
|
/* The file size. */
|
||||||
grub_off_t size;
|
grub_off_t size;
|
||||||
|
|
||||||
/* If file is not easly seekable. Should be set by underlying layer. */
|
/* If file is not easily seekable. Should be set by underlying layer. */
|
||||||
int not_easly_seekable;
|
int not_easily_seekable;
|
||||||
|
|
||||||
/* Filesystem-specific data. */
|
/* Filesystem-specific data. */
|
||||||
void *data;
|
void *data;
|
||||||
|
@ -123,7 +123,7 @@ grub_file_tell (const grub_file_t file)
|
||||||
static inline int
|
static inline int
|
||||||
grub_file_seekable (const grub_file_t file)
|
grub_file_seekable (const grub_file_t file)
|
||||||
{
|
{
|
||||||
return !file->not_easly_seekable;
|
return !file->not_easily_seekable;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* ! GRUB_FILE_HEADER */
|
#endif /* ! GRUB_FILE_HEADER */
|
||||||
|
|
Loading…
Reference in a new issue