[syslinux:firmware] load_linux: return a non-void value to fix compiler warning

syslinux-bot for Matt Fleming matt.fleming at intel.com
Thu Jun 20 06:51:11 PDT 2013


Commit-ID:  2aa4fee2cdf94f909a8c8a6b6b56abdc2e5e7afd
Gitweb:     http://www.syslinux.org/commit/2aa4fee2cdf94f909a8c8a6b6b56abdc2e5e7afd
Author:     Matt Fleming <matt.fleming at intel.com>
AuthorDate: Wed, 19 Jun 2013 15:54:05 +0100
Committer:  Matt Fleming <matt.fleming at intel.com>
CommitDate: Wed, 19 Jun 2013 15:54:05 +0100

load_linux: return a non-void value to fix compiler warning

->boot_linux() actually returns an error value, so return it to the
caller of syslinux_boot_linux() and fix the following compiler warning,

com32/lib/syslinux/load_linux.c: In function ‘syslinux_boot_linux’:
com32/lib/syslinux/load_linux.c:527:1: warning: control reaches end of non-void function [-Wreturn-type]

Signed-off-by: Matt Fleming <matt.fleming at intel.com>

---
 com32/lib/syslinux/load_linux.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/com32/lib/syslinux/load_linux.c b/com32/lib/syslinux/load_linux.c
index f6e03f7..120c69b 100644
--- a/com32/lib/syslinux/load_linux.c
+++ b/com32/lib/syslinux/load_linux.c
@@ -522,6 +522,6 @@ int syslinux_boot_linux(void *kernel_buf, size_t kernel_size,
 	return -1;
     }
 
-    firmware->boot_linux(kernel_buf, kernel_size, initramfs,
-			 setup_data, cmdline);
+    return firmware->boot_linux(kernel_buf, kernel_size, initramfs,
+				setup_data, cmdline);
 }


More information about the Syslinux-commits mailing list