Module Name: src Committed By: nakayama Date: Wed Apr 29 09:13:58 UTC 2009
Modified Files: src/usr.sbin/eeprom: defs.h main.c Log Message: More WARNS=4 fixes, for sparc and sun3. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/eeprom/defs.h cvs rdiff -u -r1.20 -r1.21 src/usr.sbin/eeprom/main.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/usr.sbin/eeprom/defs.h diff -u src/usr.sbin/eeprom/defs.h:1.12 src/usr.sbin/eeprom/defs.h:1.13 --- src/usr.sbin/eeprom/defs.h:1.12 Sun Apr 26 01:51:07 2009 +++ src/usr.sbin/eeprom/defs.h Wed Apr 29 09:13:58 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: defs.h,v 1.12 2009/04/26 01:51:07 lukem Exp $ */ +/* $NetBSD: defs.h,v 1.13 2009/04/29 09:13:58 nakayama Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -60,7 +60,7 @@ * the function that handles that value. */ struct keytabent { - char *kt_keyword; /* keyword for this entry */ + const char *kt_keyword; /* keyword for this entry */ u_int kt_offset; /* offset into prom of value */ void (*kt_handler) (struct keytabent *, char *); /* handler function for this entry */ @@ -71,7 +71,7 @@ * vice-versa. */ struct strvaltabent { - char *sv_str; /* the string ... */ + const char *sv_str; /* the string ... */ u_char sv_val; /* ... and the value */ }; Index: src/usr.sbin/eeprom/main.c diff -u src/usr.sbin/eeprom/main.c:1.20 src/usr.sbin/eeprom/main.c:1.21 --- src/usr.sbin/eeprom/main.c:1.20 Sun Apr 26 01:51:07 2009 +++ src/usr.sbin/eeprom/main.c Wed Apr 29 09:13:58 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.20 2009/04/26 01:51:07 lukem Exp $ */ +/* $NetBSD: main.c,v 1.21 2009/04/29 09:13:58 nakayama Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -33,7 +33,7 @@ #ifndef lint __COPYRIGHT("@(#) Copyright (c) 1996\ The NetBSD Foundation, Inc. All rights reserved."); -__RCSID("$NetBSD: main.c,v 1.20 2009/04/26 01:51:07 lukem Exp $"); +__RCSID("$NetBSD: main.c,v 1.21 2009/04/29 09:13:58 nakayama Exp $"); #endif #include <sys/param.h> @@ -93,7 +93,7 @@ #if defined(USE_OPENPROM) || defined(USE_OPENFIRM) || defined(USE_PREPNVRAM) const char *optstring = "-cf:iv"; #else - char *optstring = "-cf:i"; + const char *optstring = "-cf:i"; #endif /* USE_OPENPROM */ while ((ch = getopt(argc, argv, optstring)) != -1)