From grub-devel  Fri May 01 13:34:58 2009
From: Michel Hermier <michel.hermier () gmail ! com>
Date: Fri, 01 May 2009 13:34:58 +0000
To: grub-devel
Subject: [Fwd: [PATCH] Some pxe fixes.]
Message-Id: <49FAFA82.8000003 () gmail ! com>
X-MARC-Message: https://marc.info/?l=grub-devel&m=139175142439988
MIME-Version: 1
Content-Type: multipart/mixed; boundary="--------------070203030905090104070809"

This is a multi-part message in MIME format.
--------------070203030905090104070809
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

Hi,

I was toying with pxe and noticed some errors in the code small errors
in the code. In the file read method it is possible to return error
codes instead of amount read. This patch fix that by setting the error
and returning -1 instead. It also fix some coding style by removing tabs
and use UNUSED macro.

Michel


--------------070203030905090104070809
Content-Type: text/plain;
 name="pxe.diff"
Content-Transfer-Encoding: 8bit
Content-Disposition: inline;
 filename="pxe.diff"

Index: ChangeLog
===================================================================
--- ChangeLog	(révision 2154)
+++ ChangeLog	(copie de travail)
@@ -1,3 +1,9 @@
+2009-05-01  Michel Hermier  <michel.hermier@gmail.com>
+
+	* fs/i386/pc/pxe.c (grub_pxefs_read): Fix returned values.
+	Returning error codes as grub_size_t is a bad idea. Fixing
+	indent style and use UNUSED macro while at it.
+
 2009-04-30  David S. Miller  <davem@davemloft.net>
 
 	* util/hostdisk.c (device_is_wholedisk): New function.
Index: fs/i386/pc/pxe.c
===================================================================
--- fs/i386/pc/pxe.c	(révision 2154)
+++ fs/i386/pc/pxe.c	(copie de travail)
@@ -72,24 +72,24 @@
 }
 
 static void
-grub_pxe_close (grub_disk_t disk __attribute((unused)))
+grub_pxe_close (grub_disk_t disk UNUSED)
 {
 }
 
 static grub_err_t
-grub_pxe_read (grub_disk_t disk __attribute((unused)),
-               grub_disk_addr_t sector __attribute((unused)),
-               grub_size_t size __attribute((unused)),
-               char *buf __attribute((unused)))
+grub_pxe_read (grub_disk_t disk UNUSED,
+               grub_disk_addr_t sector UNUSED,
+               grub_size_t size UNUSED,
+               char *buf UNUSED)
 {
   return GRUB_ERR_OUT_OF_RANGE;
 }
 
 static grub_err_t
-grub_pxe_write (grub_disk_t disk __attribute((unused)),
-                grub_disk_addr_t sector __attribute((unused)),
-                grub_size_t size __attribute((unused)),
-                const char *buf __attribute((unused)))
+grub_pxe_write (grub_disk_t disk UNUSED,
+                grub_disk_addr_t sector UNUSED,
+                grub_size_t size UNUSED,
+                const char *buf UNUSED)
 {
   return GRUB_ERR_OUT_OF_RANGE;
 }
@@ -108,8 +108,8 @@
 
 static grub_err_t
 grub_pxefs_dir (grub_device_t device UNUSED, const char *path UNUSED,
-		int (*hook) (const char *filename,
-			     const struct grub_dirhook_info *info) UNUSED)
+                int (*hook) (const char *filename,
+                             const struct grub_dirhook_info *info) UNUSED)
 {
   return GRUB_ERR_NONE;
 }
@@ -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;
     }
@@ -246,8 +252,8 @@
 }
 
 static grub_err_t
-grub_pxefs_label (grub_device_t device __attribute ((unused)),
-		   char **label __attribute ((unused)))
+grub_pxefs_label (grub_device_t device UNUSED,
+                  char **label UNUSED)
 {
   *label = 0;
   return GRUB_ERR_NONE;


--------------070203030905090104070809--