Patch up some problems found by compiling with gcc. PKGREVISION -> 12.


(dholland)

$NetBSD: patch-src_misc.c,v 1.1 2016/05/01 19:56:40 dholland Exp $

- Use ctype.h functions correctly.

--- src/misc.c~	2004-11-10 17:21:46.000000000 +0000
+++ src/misc.c
@@ -85,7 +85,7 @@ char           *
 Str_skip_space(char *str)
 {
     if (str && *str) {
-	while (*str && isspace(*str))
+	while (*str && isspace((unsigned char)*str))
 	    str++;
     }
     return str;
@@ -102,7 +102,7 @@ Str_trim(char *str)
 	src = Str_skip_space(str);
 	n = strlen(src) - 1;
 
-	while (n > 0 && isspace(src[n]))
+	while (n > 0 && isspace((unsigned char)src[n]))
 	    n--;
 	src[n + 1] = '\0';
 
@@ -159,12 +159,12 @@ Str_escaped(char *str)
 	str[i++] = '\033';	/* destination */
 	len--;
 	p += n;
-	if (toupper(*p) == 'X') {
+	if (toupper((unsigned char)*p) == 'X') {
 	/* append carriage-return for `M-xcommand' */
 	    append = '\r';
 	    str[i++] = 'x';	/* destination */
 	    p++;
-	    while (isspace(*p)) {
+	    while (isspace((unsigned char)*p)) {
 		p++;
 		len--;
 	    }
@@ -214,7 +214,7 @@ Str_escaped(char *str)
 	    ch = *p;
 	    p++;
 	    len--;
-	    ch = toupper(ch);
+	    ch = toupper((unsigned char)ch);
 	    ch = (ch == '?' ? 127 : (ch - '@'));
 	}
 	str[i] = ch;

$NetBSD: patch-src_pixmap.c,v 1.1 2016/05/01 19:56:40 dholland Exp $

Silence some sign-mismatch warnings.

--- src/pixmap.c~	2005-06-21 20:08:16.000000000 +0000
+++ src/pixmap.c
@@ -83,19 +83,20 @@ ValidatePixmap (Pixmap p, int bSetHandle
     /* we need to check if pixmap is still valid */
 	Window root;
     int junk;
+    unsigned ujunk;
 	if (bSetHandler)
 		oldXErrorHandler = XSetErrorHandler (pixmap_error_handler);
 
     if (bTransparent)
 	    p = GetRootPixmap (None);
 	if (!pWidth)
-  		pWidth = &junk;
+  		pWidth = &ujunk;
     if (!pHeight)
-	    pHeight = &junk;
+	    pHeight = &ujunk;
 
     if (p != None)
 	{
-  		if (!XGetGeometry (dpy, p, &root, &junk, &junk, pWidth, pHeight, &junk, &junk))
+  		if (!XGetGeometry (dpy, p, &root, &junk, &junk, pWidth, pHeight, &ujunk, &junk))
 			p = None;
     }
 	if(bSetHandler)

$NetBSD: patch-src_xdefaults.c,v 1.1 2016/05/01 19:56:40 dholland Exp $

- Pass the right type (int) for %*s formats.
- Use ctype.h functions correctly.

--- src/xdefaults.c~	2005-06-03 20:11:55.000000000 +0000
+++ src/xdefaults.c
@@ -516,7 +516,7 @@ usage(int type)
 		fprintf(stderr, "    %s%s %-*s%s%s\n",
 			(optList_isBool(i) ? "-/+" : "-"),
 			optList[i].opt,
-			(INDENT - strlen(optList[i].opt)
+			(int)(INDENT - strlen(optList[i].opt)
 			 + (optList_isBool(i) ? 0 : 2)),
 			(optList[i].arg ? optList[i].arg : ""),
 			(optList_isBool(i) ? "turn on/off " : ""),
@@ -533,12 +533,12 @@ usage(int type)
 	    if (optList[i].kw != NULL)
 		fprintf(stderr, "    %s: %*s\n",
 			optList[i].kw,
-			(INDENT - strlen(optList[i].kw)),
+			(int)(INDENT - strlen(optList[i].kw)),
 			(optList_isBool(i) ? "boolean" : optList[i].arg));
 
 #ifdef KEYSYM_RESOURCE
 	fprintf(stderr, "    " "keysym.sym" ": %*s\n",
-		(INDENT - strlen("keysym.sym")), "keysym");
+		(int)(INDENT - strlen("keysym.sym")), "keysym");
 #endif
 	fprintf(stderr, "\n    -help to list options\n    -version for the version information with options list\n\n");
 	break;
@@ -686,8 +686,8 @@ int
 my_strcasecmp(const char *s1, const char *s2)
 {
     for ( /*nil */ ; (*s1 && *s2); s1++, s2++) {
-	register int    c1 = toupper(*s1);
-	register int    c2 = toupper(*s2);
+	register int    c1 = toupper((unsigned char)*s1);
+	register int    c2 = toupper((unsigned char)*s2);
 
 	if (c1 != c2)
 	    return (c1 - c2);
@@ -739,8 +739,8 @@ parse_keysym(char *str, char *arg)
 	str += n;		/* skip `keysym.' */
     }
 /* some scanf() have trouble with a 0x prefix */
-    if (isdigit(str[0])) {
-	if (str[0] == '0' && toupper(str[1]) == 'X')
+    if (isdigit((unsigned char)str[0])) {
+	if (str[0] == '0' && toupper((unsigned char)str[1]) == 'X')
 	    str += 2;
 	if (arg) {
 	    if (sscanf(str, (strchr(str, ':') ? "%x:" : "%x"), &sym) != 1)
@@ -823,7 +823,7 @@ get_xdefaults(FILE * stream, const char 
     while ((str = fgets(buffer, sizeof(buffer), stream)) != NULL) {
 	unsigned int    entry, n;
 
-	while (*str && isspace(*str))
+	while (*str && isspace((unsigned char)*str))
 	    str++;		/* leading whitespace */
 
 	if ((str[len] != '*' && str[len] != '.') ||