Module Name:    src
Committed By:   dholland
Date:           Sat Mar 22 23:45:34 UTC 2014

Modified Files:
        src/games/canfield/cfscores: cfscores.c

Log Message:
Use ssize_t for read() results. Don't use int for lseek() results.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/games/canfield/cfscores/cfscores.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/games/canfield/cfscores/cfscores.c
diff -u src/games/canfield/cfscores/cfscores.c:1.21 src/games/canfield/cfscores/cfscores.c:1.22
--- src/games/canfield/cfscores/cfscores.c:1.21	Sun Jan  3 17:08:45 2010
+++ src/games/canfield/cfscores/cfscores.c	Sat Mar 22 23:45:34 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: cfscores.c,v 1.21 2010/01/03 17:08:45 dholland Exp $	*/
+/*	$NetBSD: cfscores.c,v 1.22 2014/03/22 23:45:34 dholland Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 19
 #if 0
 static char sccsid[] = "@(#)cfscores.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: cfscores.c,v 1.21 2010/01/03 17:08:45 dholland Exp $");
+__RCSID("$NetBSD: cfscores.c,v 1.22 2014/03/22 23:45:34 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -106,7 +106,7 @@ printuser(const struct passwd *pw, int p
 {
 	struct betinfo total;
 	off_t pos;
-	int i;
+	ssize_t i;
 
 	pos = pw->pw_uid * (off_t)sizeof(struct betinfo);
 	/* test pos, not pw_uid; uid_t can be unsigned, which makes gcc warn */
@@ -114,9 +114,9 @@ printuser(const struct passwd *pw, int p
 		warnx("Bad uid %d", (int)pw->pw_uid);
 		return;
 	}
-	i = lseek(dbfd, pos, SEEK_SET);
-	if (i < 0)
-		warn("lseek %s", _PATH_SCORE);
+	if (lseek(dbfd, pos, SEEK_SET) < 0) {
+		warn("%s: lseek", _PATH_SCORE);
+	}
 	i = read(dbfd, &total, sizeof(total));
 	if (i < 0)
 		warn("read %s", _PATH_SCORE);

Reply via email to