[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[2285] 2009-06-09 Michel Hermier <address@hidden>
From: |
Vladimir Serbinenko |
Subject: |
[2285] 2009-06-09 Michel Hermier <address@hidden> |
Date: |
Tue, 09 Jun 2009 19:08:36 +0000 |
Revision: 2285
http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2285
Author: phcoder
Date: 2009-06-09 19:08:36 +0000 (Tue, 09 Jun 2009)
Log Message:
-----------
2009-06-09 Michel Hermier <address@hidden>
* fs/i386/pc/pxe.c (grub_pxefs_read): Fix returned values.
Modified Paths:
--------------
trunk/grub2/ChangeLog
trunk/grub2/fs/i386/pc/pxe.c
Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog 2009-06-09 14:42:37 UTC (rev 2284)
+++ trunk/grub2/ChangeLog 2009-06-09 19:08:36 UTC (rev 2285)
@@ -1,18 +1,12 @@
-2009-06-09 Robert Millan <address@hidden>
+2009-06-09 Michel Hermier <address@hidden>
- * util/deviceiter.c (grub_util_iterate_devices): Increase number of
- disk limit to 26 for IDE, Virtio, Xen and SCSI.
+ * fs/i386/pc/pxe.c (grub_pxefs_read): Fix returned values.
-2009-06-09 Felix Zielcke <address@hidden>
-
- * util/i386/pc/grub-install.in: Change the error message if UUIDs
- aren't avaible if ata.mod gets used.
-
2009-06-09 Oliver Henshaw <address@hidden>
- * bus/usb/ohci.c (grub_ohci_pci_iter): Link struct only after
+ * bus/usb/ohci.c (grub_ohci_pci_iter): Link struct only after
initialising controller.
- * bus/usb/uhci.c (grub_uhci_pci_iter): Likewise.
+ * bus/usb/uhci.c (grub_uhci_pci_iter): Likewise.
2009-06-08 Felix Zielcke <address@hidden>
Modified: trunk/grub2/fs/i386/pc/pxe.c
===================================================================
--- trunk/grub2/fs/i386/pc/pxe.c 2009-06-09 14:42:37 UTC (rev 2284)
+++ trunk/grub2/fs/i386/pc/pxe.c 2009-06-09 19:08:36 UTC (rev 2285)
@@ -189,8 +189,11 @@
pn = grub_divmod64 (file->offset, data->block_size, &r);
if (r)
- return grub_error (GRUB_ERR_BAD_FS,
- "read access must be aligned to packet size");
+ {
+ grub_error (GRUB_ERR_BAD_FS,
+ "read access must be aligned to packet size");
+ return -1;
+ }
if ((curr_file != file) || (data->packet_number > pn))
{
@@ -206,7 +209,10 @@
o.packet_size = data->block_size;
grub_pxe_call (GRUB_PXENV_TFTP_OPEN, &o);
if (o.status)
- return grub_error (GRUB_ERR_BAD_FS, "open fails");
+ {
+ grub_error (GRUB_ERR_BAD_FS, "open fails");
+ return -1;
+ }
data->packet_number = 0;
curr_file = file;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [2285] 2009-06-09 Michel Hermier <address@hidden>,
Vladimir Serbinenko <=