Lncvrt/grub
1
0 Fork 0
mirror of https://git.savannah.gnu.org/git/grub.git synced 2026-10-21 06:49:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

* grub-core/fs/zfs/zfs.c (grub_zfs_read): Remove useless alloc and

Browse Source 
handle NULL appropriately.
	Remove MIN.
This commit is contained in:
Vladimir 'phcoder' Serbinenko committed 2012-01-14 11:23:51 +01:00
1 parent 30c7d3ce34
commit 74a1dce71d
2 files changed
+14 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

grub-core/fs/zfs/zfs.c
+8 -10
View File
@@ -3509,14 +3509,6 @@ grub_zfs_read (grub_file_t file, char *buf, grub_size_t len)
grub_size_t read;
grub_err_t err;
if (data->file_buf == NULL)
{
data->file_buf = grub_malloc (SPA_MAXBLOCKSIZE);
if (!data->file_buf)
return -1;
data->file_start = data->file_end = 0;
}
/*
* If offset is in memory, move it into the buffer provided and return.
*/
@@ -3553,12 +3545,18 @@ grub_zfs_read (grub_file_t file, char *buf, grub_size_t len)
0, data);
data->file_buf = t;
if (err)
return -1;
{
data->file_buf = NULL;
data->file_start = data->file_end = 0;
return -1;
}
data->file_start = blkid * blksz;
data->file_end = data->file_start + blksz;
movesize = MIN (length, data->file_end - file->offset - read);
movesize = data->file_end - file->offset - read;
if (movesize > length)
movesize = length;
grub_memmove (buf, data->file_buf + file->offset + read
- data->file_start, movesize);