Module Name: src
Committed By: joerg
Date: Tue Nov 4 23:00:35 UTC 2014
Modified Files:
src/usr.bin/config: main.c mkheaders.c sem.c
Log Message:
To make -Wconversion happy, cast return value of tolower/toupper to
char.
To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/usr.bin/config/main.c
cvs rdiff -u -r1.24 -r1.25 src/usr.bin/config/mkheaders.c
cvs rdiff -u -r1.67 -r1.68 src/usr.bin/config/sem.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.71 src/usr.bin/config/main.c:1.72
--- src/usr.bin/config/main.c:1.71 Fri Oct 31 07:38:36 2014
+++ src/usr.bin/config/main.c Tue Nov 4 23:00:35 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.71 2014/10/31 07:38:36 uebayasi Exp $ */
+/* $NetBSD: main.c,v 1.72 2014/11/04 23:00:35 joerg Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
#endif
#include <sys/cdefs.h>
-__RCSID("$NetBSD: main.c,v 1.71 2014/10/31 07:38:36 uebayasi Exp $");
+__RCSID("$NetBSD: main.c,v 1.72 2014/11/04 23:00:35 joerg Exp $");
#ifndef MAKE_BOOTSTRAP
#include <sys/cdefs.h>
@@ -1556,7 +1556,7 @@ strtolower(const char *name)
char c;
for (n = name, p = low; (c = *n) != '\0'; n++)
- *p++ = isupper((u_char)c) ? tolower((u_char)c) : c;
+ *p++ = isupper((u_char)c) ? (char)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.24 src/usr.bin/config/mkheaders.c:1.25
--- src/usr.bin/config/mkheaders.c:1.24 Thu Oct 30 15:13:11 2014
+++ src/usr.bin/config/mkheaders.c Tue Nov 4 23:00:35 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: mkheaders.c,v 1.24 2014/10/30 15:13:11 christos Exp $ */
+/* $NetBSD: mkheaders.c,v 1.25 2014/11/04 23:00:35 joerg Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
#endif
#include <sys/cdefs.h>
-__RCSID("$NetBSD: mkheaders.c,v 1.24 2014/10/30 15:13:11 christos Exp $");
+__RCSID("$NetBSD: mkheaders.c,v 1.25 2014/11/04 23:00:35 joerg Exp $");
#include <sys/param.h>
#include <ctype.h>
@@ -323,7 +323,7 @@ locators_print(const char *name, void *v
locdup = estrdup(name);
for (cp = locdup; *cp; cp++)
if (islower((unsigned char)*cp))
- *cp = toupper((unsigned char)*cp);
+ *cp = (char)toupper((unsigned char)*cp);
for (i = 0, ll = a->a_locs; ll; ll = ll->ll_next, i++) {
if (strchr(ll->ll_name, ' ') != NULL ||
strchr(ll->ll_name, '\t') != NULL)
@@ -335,7 +335,7 @@ locators_print(const char *name, void *v
namedup = estrdup(ll->ll_name);
for (cp = namedup; *cp; cp++)
if (islower((unsigned char)*cp))
- *cp = toupper((unsigned char)*cp);
+ *cp = (char)toupper((unsigned char)*cp);
else if (*cp == ARRCHR)
*cp = '_';
fprintf(fp, "#define %sCF_%s %d\n", locdup, namedup, i);
@@ -533,7 +533,7 @@ cntname(const char *src)
dst = buf;
*dst++ = 'N';
while ((c = *src++) != 0)
- *dst++ = islower((u_char)c) ? toupper((u_char)c) : c;
+ *dst++ = islower((u_char)c) ? (char)toupper((u_char)c) : c;
*dst = 0;
return (buf);
}
Index: src/usr.bin/config/sem.c
diff -u src/usr.bin/config/sem.c:1.67 src/usr.bin/config/sem.c:1.68
--- src/usr.bin/config/sem.c:1.67 Sat Nov 1 04:34:27 2014
+++ src/usr.bin/config/sem.c Tue Nov 4 23:00:35 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sem.c,v 1.67 2014/11/01 04:34:27 uebayasi Exp $ */
+/* $NetBSD: sem.c,v 1.68 2014/11/04 23:00:35 joerg Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
#endif
#include <sys/cdefs.h>
-__RCSID("$NetBSD: sem.c,v 1.67 2014/11/01 04:34:27 uebayasi Exp $");
+__RCSID("$NetBSD: sem.c,v 1.68 2014/11/04 23:00:35 joerg Exp $");
#include <sys/param.h>
#include <ctype.h>
@@ -398,7 +398,7 @@ defdevclass(const char *name, struct loc
"lower-case alphanumeric characters");
errored = 1;
}
- *cp = toupper((unsigned char)*cp);
+ *cp = (char)toupper((unsigned char)*cp);
}
a->a_devclass = intern(classenum);
