summaryrefslogtreecommitdiff
path: root/payloads/libpayload
diff options
context:
space:
mode:
authorMathias Krause <mathias.krause@secunet.com>2012-02-17 11:53:28 +0100
committerStefan Reinauer <stefan.reinauer@coreboot.org>2012-02-17 19:24:11 +0100
commit632ab1ff6501e87b2b51da88f9dd9ca7b1b90e49 (patch)
treed8e36e22157d511c77abe4ed689e96dc93165e27 /payloads/libpayload
parentf01291dd64175b0c03a218f5ee4ad306ad779183 (diff)
libpayload: fix compiler warning for first_cmos_entry()
The 'name' argument to lookup_cmos_entry() is declared to be 'char *' but we pass an empty string ("") which is 'const char[]' so the compiler legitimatly warns about discarded qualifiers here. Fix this by passing NULL as 'name'. Minor nitpick: The NULL test in lookup_cmos_entry() is superfluous as our implementation of strnlen() can handle NULL pointers gracefully. But for an average C hacker it just doesn't feel right not to do so. Change-Id: I592917d12d8fa840804c0d19e38b844427064fef Signed-off-by: Mathias Krause <mathias.krause@secunet.com> Reviewed-on: http://review.coreboot.org/651 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'payloads/libpayload')
-rw-r--r--payloads/libpayload/drivers/options.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/payloads/libpayload/drivers/options.c b/payloads/libpayload/drivers/options.c
index 7c762516f5..73316c1de6 100644
--- a/payloads/libpayload/drivers/options.c
+++ b/payloads/libpayload/drivers/options.c
@@ -155,7 +155,7 @@ static int set_cmos_value(const struct nvram_accessor *nvram, u32 bitnum, u32 le
static struct cb_cmos_entries *lookup_cmos_entry(struct cb_cmos_option_table *option_table, char *name)
{
struct cb_cmos_entries *cmos_entry;
- int len = strnlen(name, CMOS_MAX_NAME_LENGTH);
+ int len = name ? strnlen(name, CMOS_MAX_NAME_LENGTH) : 0;
/* cmos entries are located right after the option table */
@@ -173,7 +173,7 @@ static struct cb_cmos_entries *lookup_cmos_entry(struct cb_cmos_option_table *op
struct cb_cmos_entries *first_cmos_entry(struct cb_cmos_option_table *option_table)
{
- return lookup_cmos_entry(option_table, "");
+ return lookup_cmos_entry(option_table, NULL);
}
struct cb_cmos_entries *next_cmos_entry(struct cb_cmos_entries *cmos_entry)