Module Name: src
Committed By: lukem
Date: Sun Apr 19 02:25:48 UTC 2009
Modified Files:
src/usr.sbin/wsfontload: wsfontload.c
Log Message:
Fix -Wsign-compare issues
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/wsfontload/wsfontload.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/wsfontload/wsfontload.c
diff -u src/usr.sbin/wsfontload/wsfontload.c:1.13 src/usr.sbin/wsfontload/wsfontload.c:1.14
--- src/usr.sbin/wsfontload/wsfontload.c:1.13 Mon May 26 12:15:42 2008
+++ src/usr.sbin/wsfontload/wsfontload.c Sun Apr 19 02:25:48 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: wsfontload.c,v 1.13 2008/05/26 12:15:42 drochner Exp $ */
+/* $NetBSD: wsfontload.c,v 1.14 2009/04/19 02:25:48 lukem Exp $ */
/*
* Copyright (c) 1999
@@ -87,7 +87,7 @@
static const char *
rgetfontorder(int fontorder)
{
- int i;
+ size_t i;
for (i = 0; i < sizeof(fontorders) / sizeof(fontorders[0]); i++)
if (fontorders[i].val == fontorder)
@@ -102,7 +102,7 @@
static const char *
rgetencoding(int enc)
{
- int i;
+ size_t i;
for (i = 0; i < sizeof(encodings) / sizeof(encodings[0]); i++)
if (encodings[i].val == enc)
@@ -117,15 +117,16 @@
static int
getencoding(char *name)
{
- int i;
+ size_t i;
+ int j;
for (i = 0; i < sizeof(encodings) / sizeof(encodings[0]); i++)
if (!strcmp(name, encodings[i].name))
return (encodings[i].val);
- if (sscanf(name, "%d", &i) != 1)
+ if (sscanf(name, "%d", &j) != 1)
errx(1, "invalid encoding");
- return (i);
+ return (j);
}
int
@@ -213,7 +214,7 @@
res = read(ffd, buf, len);
if (res < 0)
err(4, "read font");
- if (res != len)
+ if ((size_t)res != len)
errx(4, "short read");
f.data = buf;
