* grub-core/loader/xnu.c (grub_xnu_writetree_toheap_real): Avoid set

	in if.

diff --git a/ChangeLog b/ChangeLog
index 273db00a040b0e0d512181a5207e02c8f97dcc78..512493b03ba42d314c4e8d30245382b9ed3e9747 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-12  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/loader/xnu.c (grub_xnu_writetree_toheap_real): Avoid set
+       in if.
+
 2012-02-12  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/loader/efi/appleloader.c (grub_cmd_appleloader): Move

diff --git a/grub-core/loader/xnu.c b/grub-core/loader/xnu.c
index d01a6af6c316b2d95c7aa7074e7a2fa075afdc7a..bd44001884e6dd2d0771da5f3030bbc5a380183a 100644 (file)
--- a/grub-core/loader/xnu.c
+++ b/grub-core/loader/xnu.c
@@ -189,10 +189,13 @@ grub_xnu_writetree_toheap_real (void *curptr,
   /* And then the keys. Recursively use this function. */
   for (cur = start; cur; cur = cur->next)
     if (cur->datasize == -1)
-      if (!(curptr = grub_xnu_writetree_toheap_real (curptr,
-                                                    cur->first_child,
-                                                    cur->name)))
-       return 0;
+      {
+       curptr = grub_xnu_writetree_toheap_real (curptr,
+                                                cur->first_child,
+                                                cur->name);
+       if (!curptr)
+         return 0;
+      }
   return curptr;
 }