From 7f96583f0f6b9829f73fb8afbb6f367323446030 Mon Sep 17 00:00:00 2001
From: Patrick Georgi <patrick@georgi-clan.de>
Date: Thu, 21 Apr 2011 18:57:16 +0200
Subject: Reduce warnings/errors in libpayload when using picky compiler
 options

The new build system uses quite a few more -W flags for the compiler by
default than the old one. And that's for the better.

Change-Id: Ia8e3d28fb35c56760c2bd0983046c7067e8c5dd6
Signed-off-by: Patrick Georgi <patrick@georgi-clan.de>
Reviewed-on: http://review.coreboot.org/72
Tested-by: build bot (Jenkins)
Reviewed-by: Uwe Hermann <uwe@hermann-uwe.de>
---
 payloads/libpayload/libc/getopt_long.c | 4 +---
 payloads/libpayload/libc/printf.c      | 2 +-
 payloads/libpayload/libc/strings.c     | 2 ++
 payloads/libpayload/libc/sysinfo.c     | 2 --
 4 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'payloads/libpayload/libc')

diff --git a/payloads/libpayload/libc/getopt_long.c b/payloads/libpayload/libc/getopt_long.c
index 493df4d3b3..365bc4a85a 100644
--- a/payloads/libpayload/libc/getopt_long.c
+++ b/payloads/libpayload/libc/getopt_long.c
@@ -57,10 +57,8 @@
 #include <libpayload.h>
 #include <getopt.h>
 #define warnx(x...) printf(x)
-/*
 #include <stdlib.h>
 #include <string.h>
-*/
 #define	REPLACE_GETOPT		/* use this getopt as the system getopt(3) */
 
 #ifdef REPLACE_GETOPT
@@ -84,7 +82,7 @@ int posixly_correct = 0;
 #define	BADARG		((*options == ':') ? (int)':' : (int)'?')
 #define	INORDER 	(int)1
 
-#define	EMSG		""
+#define	EMSG		(char*)""
 
 static int getopt_internal(int, char * const *, const char *,
 			   const struct option *, int *, int);
diff --git a/payloads/libpayload/libc/printf.c b/payloads/libpayload/libc/printf.c
index 389d2277ea..e3cf8bbb24 100644
--- a/payloads/libpayload/libc/printf.c
+++ b/payloads/libpayload/libc/printf.c
@@ -114,7 +114,7 @@ static int printf_putstr(const char *str, struct printf_spec *ps)
 	size_t count;
 
 	if (str == NULL) {
-		char *nullstr = "(NULL)";
+		const char *nullstr = "(NULL)";
 		return printf_putnchars(nullstr, strlen(nullstr), ps);
 	}
 
diff --git a/payloads/libpayload/libc/strings.c b/payloads/libpayload/libc/strings.c
index 9a56ba127c..465ae4f12d 100644
--- a/payloads/libpayload/libc/strings.c
+++ b/payloads/libpayload/libc/strings.c
@@ -27,6 +27,8 @@
  * SUCH DAMAGE.
  */
 
+#include <strings.h>
+
 int ffs(int i)
 {
 	int count = 1;
diff --git a/payloads/libpayload/libc/sysinfo.c b/payloads/libpayload/libc/sysinfo.c
index 73a9ab5539..b1cad50302 100644
--- a/payloads/libpayload/libc/sysinfo.c
+++ b/payloads/libpayload/libc/sysinfo.c
@@ -30,8 +30,6 @@
 #include <libpayload.h>
 #include <sysinfo.h>
 
-extern struct sysinfo_t lib_sysinfo;
-
 int sysinfo_have_multiboot(unsigned long *addr)
 {
 	*addr = (unsigned long) lib_sysinfo.mbtable;
-- 
cgit v1.2.3