grub-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH 7/10]: Fix several warnings on sparc64.


From: David Miller
Subject: [PATCH 7/10]: Fix several warnings on sparc64.
Date: Wed, 04 Mar 2009 17:32:32 -0800 (PST)

2009-03-04 David S. Miller <address@hidden>

        * kern/ieee1275/cmain.c (grub_ieee1275_init): Third arg to
        grub_ieee1275_get_integer_property is a grub_uint32_t pointer.
        * kern/ieee1275/init.c (grub_machine_init): Fix type of
        'actual'.
        * kern/ieee1275/openfw.c (grub_children_iterate): Likewise.
        (grub_devalias_iterate): Likewise.
        * term/ieee1275/ofconsole.c (grub_ofconsole_init_input):
        Fix third arg to grub_ieee1275_get_integer_property.
        (grub_ofconsole_init_output): Likewise.
---
 kern/ieee1275/cmain.c     |    6 +++++-
 kern/ieee1275/init.c      |    2 +-
 kern/ieee1275/openfw.c    |    4 ++--
 term/ieee1275/ofconsole.c |   10 ++++++++--
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/kern/ieee1275/cmain.c b/kern/ieee1275/cmain.c
index b5e2ba6..942fe02 100644
--- a/kern/ieee1275/cmain.c
+++ b/kern/ieee1275/cmain.c
@@ -157,11 +157,15 @@ grub_ieee1275_find_options (void)
 void
 grub_ieee1275_init (void)
 {
+  grub_uint32_t val;
+
   grub_ieee1275_finddevice ("/chosen", &grub_ieee1275_chosen);
 
-  if (grub_ieee1275_get_integer_property (grub_ieee1275_chosen, "mmu", 
&grub_ieee1275_mmu,
+  if (grub_ieee1275_get_integer_property (grub_ieee1275_chosen, "mmu", &val,
                                          sizeof grub_ieee1275_mmu, 0) < 0)
     grub_ieee1275_mmu = 0;
+  else
+    grub_ieee1275_mmu = val;
 
   grub_ieee1275_find_options ();
 }
diff --git a/kern/ieee1275/init.c b/kern/ieee1275/init.c
index d345ba2..27783cc 100644
--- a/kern/ieee1275/init.c
+++ b/kern/ieee1275/init.c
@@ -213,7 +213,7 @@ void
 grub_machine_init (void)
 {
   char args[256];
-  int actual;
+  grub_ssize_t actual;
 
   grub_ieee1275_init ();
 
diff --git a/kern/ieee1275/openfw.c b/kern/ieee1275/openfw.c
index e88f3b3..4229c6e 100644
--- a/kern/ieee1275/openfw.c
+++ b/kern/ieee1275/openfw.c
@@ -53,7 +53,7 @@ grub_children_iterate (char *devpath,
       char childname[64];
       char fullname[64];
       struct grub_ieee1275_devalias alias;
-      int actual;
+      grub_ssize_t actual;
 
       if (grub_ieee1275_get_property (child, "device_type", &childtype,
                                      sizeof childtype, &actual))
@@ -86,7 +86,7 @@ grub_devalias_iterate (int (*hook) (struct 
grub_ieee1275_devalias *alias))
 {
   grub_ieee1275_phandle_t aliases;
   char aliasname[32];
-  int actual;
+  grub_ssize_t actual;
   struct grub_ieee1275_devalias alias;
 
   if (grub_ieee1275_finddevice ("/aliases", &aliases))
diff --git a/term/ieee1275/ofconsole.c b/term/ieee1275/ofconsole.c
index 70fda9a..5954b0c 100644
--- a/term/ieee1275/ofconsole.c
+++ b/term/ieee1275/ofconsole.c
@@ -341,12 +341,15 @@ static grub_err_t
 grub_ofconsole_init_input (void)
 {
   grub_ssize_t actual;
+  grub_uint32_t val;
 
-  if (grub_ieee1275_get_integer_property (grub_ieee1275_chosen, "stdin", 
&stdin_ihandle,
+  if (grub_ieee1275_get_integer_property (grub_ieee1275_chosen, "stdin", &val,
                                          sizeof stdin_ihandle, &actual)
       || actual != sizeof stdin_ihandle)
     return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "Cannot find stdin");
 
+  stdin_ihandle = val;
+
   return 0;
 }
 
@@ -354,6 +357,7 @@ static grub_err_t
 grub_ofconsole_init_output (void)
 {
   grub_ssize_t actual;
+  grub_uint32_t val;
   int col;
 
   /* The latest PowerMacs don't actually initialize the screen for us, so we
@@ -362,11 +366,13 @@ grub_ofconsole_init_output (void)
   if (! grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_BROKEN_OUTPUT))
     grub_ieee1275_interpret ("output-device output", 0);
 
-  if (grub_ieee1275_get_integer_property (grub_ieee1275_chosen, "stdout", 
&stdout_ihandle,
+  if (grub_ieee1275_get_integer_property (grub_ieee1275_chosen, "stdout", &val,
                                          sizeof stdout_ihandle, &actual)
       || actual != sizeof stdout_ihandle)
     return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "Cannot find stdout");
 
+  stdout_ihandle = val;
+
   /* Initialize colors.  */
   if (! grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_CANNOT_SET_COLORS))
     {
-- 
1.6.2





reply via email to

[Prev in Thread] Current Thread [Next in Thread]