From 070e49e4e8a12b3e66a911d2fa820495f56f3131 Mon Sep 17 00:00:00 2001
From: proski <proski@localhost>
Date: Fri, 4 Apr 2008 06:45:07 +0000
Subject: [PATCH] 2008-04-04  Pavel Roskin  <proski@gnu.org>

	* kern/powerpc/ieee1275/cmain.c (grub_ieee1275_find_options):
	Fix signedness warnings.
	* kern/powerpc/ieee1275/openfw.c (grub_available_iterate):
	Likewise.
	* util/ieee1275/get_disk_name.c: Include config.h so that
	_GNU_SOURCE is defined and getline() is declared.  Mark an
	unused argument as such.  Fix a signedness warning.
---
 ChangeLog                      | 10 ++++++++++
 kern/powerpc/ieee1275/cmain.c  |  2 +-
 kern/powerpc/ieee1275/openfw.c |  6 +++---
 util/ieee1275/get_disk_name.c  |  5 +++--
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 68e5327f6..19d190a36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-04-04  Pavel Roskin  <proski@gnu.org>
+
+	* kern/powerpc/ieee1275/cmain.c (grub_ieee1275_find_options):
+	Fix signedness warnings.
+	* kern/powerpc/ieee1275/openfw.c (grub_available_iterate):
+	Likewise.
+	* util/ieee1275/get_disk_name.c: Include config.h so that
+	_GNU_SOURCE is defined and getline() is declared.  Mark an
+	unused argument as such.  Fix a signedness warning.
+
 2008-04-02  Pavel Roskin  <proski@gnu.org>
 
 	* genkernsyms.sh.in: Use more robust assignments for CC and
diff --git a/kern/powerpc/ieee1275/cmain.c b/kern/powerpc/ieee1275/cmain.c
index 0a3a2a5c7..31947ccb4 100644
--- a/kern/powerpc/ieee1275/cmain.c
+++ b/kern/powerpc/ieee1275/cmain.c
@@ -57,7 +57,7 @@ grub_ieee1275_find_options (void)
   grub_ieee1275_phandle_t openprom;
   grub_ieee1275_phandle_t bootrom;
   int rc;
-  int realmode = 0;
+  grub_uint32_t realmode = 0;
   char tmp[32];
   int is_smartfirmware = 0;
   int is_olpc = 0;
diff --git a/kern/powerpc/ieee1275/openfw.c b/kern/powerpc/ieee1275/openfw.c
index 26ff3d5fa..69164a627 100644
--- a/kern/powerpc/ieee1275/openfw.c
+++ b/kern/powerpc/ieee1275/openfw.c
@@ -153,9 +153,9 @@ grub_err_t grub_available_iterate (int (*hook) (grub_uint64_t, grub_uint64_t))
   grub_ieee1275_phandle_t memory;
   grub_uint32_t available[32];
   grub_ssize_t available_size;
-  int address_cells = 1;
-  int size_cells = 1;
-  unsigned int i;
+  grub_uint32_t address_cells = 1;
+  grub_uint32_t size_cells = 1;
+  int i;
 
   /* Determine the format of each entry in `available'.  */
   grub_ieee1275_finddevice ("/", &root);
diff --git a/util/ieee1275/get_disk_name.c b/util/ieee1275/get_disk_name.c
index 6370fe6fd..30e965ab4 100644
--- a/util/ieee1275/get_disk_name.c
+++ b/util/ieee1275/get_disk_name.c
@@ -17,16 +17,17 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdio.h>
 #include <grub/util/misc.h>
 
 char *
-grub_util_get_disk_name (int disk, char *name)
+grub_util_get_disk_name (int disk __attribute__ ((unused)), char *name)
 {
   int p[2];
 
   char *line = NULL;
-  int zero = 0;
+  size_t zero = 0;
   int len;
 
   pipe (p);