[2561] 2009-09-02 Vladimir Serbinenko <[email protected]>

Vladimir Serbinenko <[email protected]> Wed, 02 Sep 2009 16:16:30 +0000
Newsgroups gmane.comp.boot-loaders.grub.cvs
Message-ID <[email protected]>
Revision: 2561
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2561
Author:   phcoder
Date:     2009-09-02 16:16:29 +0000 (Wed, 02 Sep 2009)
Log Message:
-----------
2009-09-02  Vladimir Serbinenko  <[email protected]>

	* efiemu/loadcore.c (SUFFIX (grub_efiemu_loadcore_load)): Fix style
	according to GCS.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/efiemu/loadcore.c

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog	2009-09-02 09:29:58 UTC (rev 2560)
+++ trunk/grub2/ChangeLog	2009-09-02 16:16:29 UTC (rev 2561)
@@ -1,5 +1,10 @@
-2009-09-02  Colin Watson  <[email protected]>
+2009-09-02  Vladimir Serbinenko  <[email protected]>
 
+	* efiemu/loadcore.c (SUFFIX (grub_efiemu_loadcore_load)): Fix style
+	according to GCS.
+
+2009-09-02  Colin Watson  <[email protected]>
+
 	* docs/grub.texi (Naming convention): Describe one-based partition
 	numbering.
 	(Device syntax): Likewise.

Modified: trunk/grub2/efiemu/loadcore.c
===================================================================
--- trunk/grub2/efiemu/loadcore.c	2009-09-02 09:29:58 UTC (rev 2560)
+++ trunk/grub2/efiemu/loadcore.c	2009-09-02 16:16:29 UTC (rev 2561)
@@ -352,13 +352,18 @@
 				    grub_efiemu_segment_t segments)
 {
   grub_err_t err;
-  if ((err = grub_efiemu_load_segments (segments, core)))
+  err = grub_efiemu_load_segments (segments, core);
+  if (err)
     return err;
-  if ((err = grub_efiemu_resolve_symbols (segments, core)))
+
+  err = grub_efiemu_resolve_symbols (segments, core);
+  if (err)
     return err;
-  if ((err = SUFFIX (grub_arch_efiemu_relocate_symbols) (segments,
-							 grub_efiemu_elfsyms,
-							 core)))
+
+  err = SUFFIX (grub_arch_efiemu_relocate_symbols) (segments,
+						    grub_efiemu_elfsyms,
+						    core);
+  if (err)
     return err;
 
   return GRUB_ERR_NONE;