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

* grub-core/io/bufio.c (grub_bufio_open): Use grub_zalloc instead of

Browse source 
explicitly zeroing elements.
* grub-core/io/gzio.c (grub_gzio_open): Likewise.
* grub-core/io/lzopio.c (grub_lzopio_open): Remove explicit zeroing
of elements in a structure already allocated using grub_zalloc.
* grub-core/io/xzio.c (grub_xzio_open): Likewise.
This commit is contained in:
Colin Watson 2013-01-07 10:45:05 +00:00
parent 86065b0ad6
commit f8861eaf9f
5 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2013-01-07 Colin Watson <cjwatson@ubuntu.com>
* grub-core/io/bufio.c (grub_bufio_open): Use grub_zalloc instead of
explicitly zeroing elements.
* grub-core/io/gzio.c (grub_gzio_open): Likewise.
* grub-core/io/lzopio.c (grub_lzopio_open): Remove explicit zeroing
of elements in a structure already allocated using grub_zalloc.
* grub-core/io/xzio.c (grub_xzio_open): Likewise.
2013-01-07 Colin Watson <cjwatson@ubuntu.com> 2013-01-07 Colin Watson <cjwatson@ubuntu.com>
* docs/grub.texi (grub_cpu): New subsection. * docs/grub.texi (grub_cpu): New subsection.

8
grub-core/io/bufio.c
View file

@ -48,7 +48,7 @@ grub_bufio_open (grub_file_t io, int size)
grub_file_t file; grub_file_t file;
grub_bufio_t bufio = 0; grub_bufio_t bufio = 0;
file = (grub_file_t) grub_malloc (sizeof (*file)); file = (grub_file_t) grub_zalloc (sizeof (*file));
if (! file) if (! file)
return 0; return 0;
@ -61,7 +61,7 @@ grub_bufio_open (grub_file_t io, int size)
size = ((io->size > GRUB_BUFIO_MAX_SIZE) ? GRUB_BUFIO_MAX_SIZE : size = ((io->size > GRUB_BUFIO_MAX_SIZE) ? GRUB_BUFIO_MAX_SIZE :
io->size); io->size);
bufio = grub_malloc (sizeof (struct grub_bufio) + size); bufio = grub_zalloc (sizeof (struct grub_bufio) + size);
if (! bufio) if (! bufio)
{ {
grub_free (file); grub_free (file);
@ -70,14 +70,10 @@ grub_bufio_open (grub_file_t io, int size)
bufio->file = io; bufio->file = io;
bufio->block_size = size; bufio->block_size = size;
bufio->buffer_len = 0;
bufio->buffer_at = 0;
file->device = io->device; file->device = io->device;
file->offset = 0;
file->size = io->size; file->size = io->size;
file->data = bufio; file->data = bufio;
file->read_hook = 0;
file->fs = &grub_bufio_fs; file->fs = &grub_bufio_fs;
file->not_easily_seekable = io->not_easily_seekable; file->not_easily_seekable = io->not_easily_seekable;

4
grub-core/io/gzio.c
View file

@ -1130,7 +1130,7 @@ grub_gzio_open (grub_file_t io)
grub_file_t file; grub_file_t file;
grub_gzio_t gzio = 0; grub_gzio_t gzio = 0;
file = (grub_file_t) grub_malloc (sizeof (*file)); file = (grub_file_t) grub_zalloc (sizeof (*file));
if (! file) if (! file)
return 0; return 0;
@ -1144,9 +1144,7 @@ grub_gzio_open (grub_file_t io)
gzio->file = io; gzio->file = io;
file->device = io->device; file->device = io->device;
file->offset = 0;
file->data = gzio; file->data = gzio;
file->read_hook = 0;
file->fs = &grub_gzio_fs; file->fs = &grub_gzio_fs;
file->not_easily_seekable = 1; file->not_easily_seekable = 1;

2
grub-core/io/lzopio.c
View file

@ -428,9 +428,7 @@ grub_lzopio_open (grub_file_t io)
lzopio->file = io; lzopio->file = io;
file->device = io->device; file->device = io->device;
file->offset = 0;
file->data = lzopio; file->data = lzopio;
file->read_hook = 0;
file->fs = &grub_lzopio_fs; file->fs = &grub_lzopio_fs;
file->size = GRUB_FILE_SIZE_UNKNOWN; file->size = GRUB_FILE_SIZE_UNKNOWN;
file->not_easily_seekable = 1; file->not_easily_seekable = 1;

6
grub-core/io/xzio.c
View file

@ -186,12 +186,9 @@ grub_xzio_open (grub_file_t io)
} }
xzio->file = io; xzio->file = io;
xzio->saved_offset = 0;
file->device = io->device; file->device = io->device;
file->offset = 0;
file->data = xzio; file->data = xzio;
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_easily_seekable = 1; file->not_easily_seekable = 1;
@ -210,10 +207,7 @@ grub_xzio_open (grub_file_t io)
} }
xzio->buf.in = xzio->inbuf; xzio->buf.in = xzio->inbuf;
xzio->buf.in_pos = 0;
xzio->buf.in_size = 0;
xzio->buf.out = xzio->outbuf; xzio->buf.out = xzio->outbuf;
xzio->buf.out_pos = 0;
xzio->buf.out_size = XZBUFSIZ; xzio->buf.out_size = XZBUFSIZ;
/* FIXME: don't test footer on not easily seekable files. */ /* FIXME: don't test footer on not easily seekable files. */