CVS commit: src/usr.bin/config

[Christos Zoulas]

Module Name:    src
Committed By:   christos
Date:           Thu Jan 22 20:01:22 UTC 2015

Modified Files:
        src/usr.bin/config: main.c mkheaders.c

Log Message:
appease gcc-4.5.4


To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 src/usr.bin/config/main.c
cvs rdiff -u -r1.25 -r1.26 src/usr.bin/config/mkheaders.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.bin/config/main.c
diff -u src/usr.bin/config/main.c:1.73 src/usr.bin/config/main.c:1.74
--- src/usr.bin/config/main.c:1.73	Thu Nov  6 06:40:32 2014
+++ src/usr.bin/config/main.c	Thu Jan 22 15:01:22 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.73 2014/11/06 11:40:32 uebayasi Exp $	*/
+/*	$NetBSD: main.c,v 1.74 2015/01/22 20:01:22 christos Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: main.c,v 1.73 2014/11/06 11:40:32 uebayasi Exp $");
+__RCSID("$NetBSD: main.c,v 1.74 2015/01/22 20:01:22 christos Exp $");
 
 #ifndef MAKE_BOOTSTRAP
 #include <sys/cdefs.h>
@@ -1557,8 +1557,8 @@ strtolower(const char *name)
 	char c;
 
 	for (n = name, p = low; (c = *n) != '\0'; n++)
-		*p++ = isupper((u_char)c) ? (char)tolower((u_char)c) : c;
-	*p = 0;
+		*p++ = (char)(isupper((u_char)c) ? tolower((u_char)c) : c);
+	*p = '\0';
 	return (intern(low));
 }
 

Index: src/usr.bin/config/mkheaders.c
diff -u src/usr.bin/config/mkheaders.c:1.25 src/usr.bin/config/mkheaders.c:1.26
--- src/usr.bin/config/mkheaders.c:1.25	Tue Nov  4 18:00:35 2014
+++ src/usr.bin/config/mkheaders.c	Thu Jan 22 15:01:22 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: mkheaders.c,v 1.25 2014/11/04 23:00:35 joerg Exp $	*/
+/*	$NetBSD: mkheaders.c,v 1.26 2015/01/22 20:01:22 christos Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: mkheaders.c,v 1.25 2014/11/04 23:00:35 joerg Exp $");
+__RCSID("$NetBSD: mkheaders.c,v 1.26 2015/01/22 20:01:22 christos Exp $");
 
 #include <sys/param.h>
 #include <ctype.h>
@@ -533,7 +533,7 @@ cntname(const char *src)
 	dst = buf;
 	*dst++ = 'N';
 	while ((c = *src++) != 0)
-		*dst++ = islower((u_char)c) ? (char)toupper((u_char)c) : c;
+		*dst++ = (char)(islower((u_char)c) ? toupper((u_char)c) : c);
 	*dst = 0;
 	return (buf);
 }