From 59bfe502c960115f7567ae63edea28142e22e4ba Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Sun, 12 Feb 2012 19:08:55 +0100 Subject: [PATCH] * grub-core/loader/xnu.c (grub_xnu_writetree_toheap_real): Avoid set in if. --- ChangeLog | 5 +++++ grub-core/loader/xnu.c | 11 +++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 273db00a0..512493b03 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-02-12 Vladimir Serbinenko + + * grub-core/loader/xnu.c (grub_xnu_writetree_toheap_real): Avoid set + in if. + 2012-02-12 Vladimir Serbinenko * 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 d01a6af6c..bd4400188 100644 --- 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; }