From 6c0d7eee97dbfd73793a06dc297ac38c6f676a5d Mon Sep 17 00:00:00 2001 From: proski Date: Fri, 17 Apr 2009 16:35:26 +0000 Subject: [PATCH] 2009-04-17 Pavel Roskin * loader/multiboot_loader.c (grub_cmd_multiboot_loader): Fix return without a value. Fix inconsistent indentation. git-svn-id: svn+ssh://svn.savannah.gnu.org/grub/trunk/grub2@2125 d0de0278-0dc1-4c01-8a07-af38b3205e46 --- ChangeLog | 3 +++ loader/multiboot_loader.c | 22 +++++++++++----------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5b568037..d4468e1c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2009-04-17 Pavel Roskin + * 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. diff --git a/loader/multiboot_loader.c b/loader/multiboot_loader.c index f4a39330..11ba666b 100644 --- a/loader/multiboot_loader.c +++ b/loader/multiboot_loader.c @@ -131,36 +131,36 @@ grub_cmd_multiboot_loader (grub_command_t cmd __attribute__ ((unused)), 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); -- 2.11.4.GIT