[2125] 2009-04-17 Pavel Roskin <[email protected]>

Pavel Roskin <[email protected]>
Newsgroups gmane.comp.boot-loaders.grub.cvs
Message-ID <[email protected]>
Revision: 2125
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2125
Author:   proski
Date:     2009-04-17 16:35:26 +0000 (Fri, 17 Apr 2009)
Log Message:
-----------
2009-04-17  Pavel Roskin  <[email protected]>

	* loader/multiboot_loader.c (grub_cmd_multiboot_loader): Fix
	return without a value.  Fix inconsistent indentation.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/loader/multiboot_loader.c

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog	2009-04-17 16:08:24 UTC (rev 2124)
+++ trunk/grub2/ChangeLog	2009-04-17 16:35:26 UTC (rev 2125)
@@ -1,5 +1,8 @@
 2009-04-17  Pavel Roskin  <[email protected]>
 
+	* loader/multiboot_loader.c (grub_cmd_multiboot_loader): Fix
+	return without a value.  Fix inconsistent indentation.
+
 	* fs/i386/pc/pxe.c (grub_pxefs_dir): Fix function prototype to
 	match struct grub_fs.
 

Modified: trunk/grub2/loader/multiboot_loader.c
===================================================================
--- trunk/grub2/loader/multiboot_loader.c	2009-04-17 16:08:24 UTC (rev 2124)
+++ trunk/grub2/loader/multiboot_loader.c	2009-04-17 16:35:26 UTC (rev 2125)
@@ -131,36 +131,36 @@
       goto fail;
     }
 
-   /* close file before calling functions */
-   if (file)
-     grub_file_close (file);
+  /* close file before calling functions */
+  if (file)
+    grub_file_close (file);
 
-   /* Launch multi boot with header */
+  /* Launch multi boot with header */
 
-   /* XXX Find a better way to identify this. 
-      This is for i386-pc */
+  /* XXX Find a better way to identify this. 
+     This is for i386-pc */
 #if defined(GRUB_MACHINE_PCBIOS) || defined(GRUB_MACHINE_LINUXBIOS)
   if (header_multi_ver_found == 1)
     {
       grub_dprintf ("multiboot_loader",
-           "Launching multiboot 1 grub_multiboot() function\n");
-      grub_multiboot (argc, argv);     
+		    "Launching multiboot 1 grub_multiboot() function\n");
+      grub_multiboot (argc, argv);
       module_version_status = 1;
     }
 #endif
   if (header_multi_ver_found == 0 || header_multi_ver_found == 2)
     {
       grub_dprintf ("multiboot_loader",
-           "Launching multiboot 2 grub_multiboot2() function\n");
+		    "Launching multiboot 2 grub_multiboot2() function\n");
       grub_multiboot2 (argc, argv);
       module_version_status = 2;
     }
 
-   return;
+  return grub_errno;
 
 fail:
   if (file)
-     grub_file_close (file);
+    grub_file_close (file);
 
   grub_dl_unref (my_mod);
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.