Module Name:    src
Committed By:   dholland
Date:           Wed Feb  9 06:26:48 UTC 2011

Modified Files:
        src/usr.bin/rpcinfo: rpcinfo.c

Log Message:
Fix broken build (hi Christos!)


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/usr.bin/rpcinfo/rpcinfo.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/rpcinfo/rpcinfo.c
diff -u src/usr.bin/rpcinfo/rpcinfo.c:1.30 src/usr.bin/rpcinfo/rpcinfo.c:1.31
--- src/usr.bin/rpcinfo/rpcinfo.c:1.30	Tue Feb  8 22:16:58 2011
+++ src/usr.bin/rpcinfo/rpcinfo.c	Wed Feb  9 06:26:48 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: rpcinfo.c,v 1.30 2011/02/08 22:16:58 christos Exp $	*/
+/*	$NetBSD: rpcinfo.c,v 1.31 2011/02/09 06:26:48 dholland Exp $	*/
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -114,7 +114,7 @@
 };
 
 struct verslist {
-	int vers;
+	rpcvers_t vers;
 	struct verslist *next;
 };
 
@@ -843,7 +843,7 @@
 			(void)printf("%10lu  ", (unsigned long)rs->prog);
 			for (vl = rs->vlist; vl; vl = vl->next) {
 				(void)snprintf(q, sizeof(buf) - (q - buf),
-				    "%d", vl->vers);
+				    "%lu", (unsigned long)vl->vers);
 				q = q + strlen(q);
 				if (vl->next) {
 					(void)snprintf(q,
@@ -1531,12 +1531,14 @@
 {
 	char *strptr;
 	rpcvers_t vers;
+	unsigned long ulvers;
 
-	vers = strtoul(arg, &strptr, 0);
+	ulvers = strtoul(arg, &strptr, 0);
 	if (strptr == arg || *strptr != '\0' ||
-	    (vers == ULONG_MAX && errno == ERANGE))
+	    (ulvers == ULONG_MAX && errno == ERANGE))
 		errx(1, "Illegal version number `%s'", arg);
-	return (rpcvers_t)vers;
+	vers = (rpcvers_t)ulvers;
+	return vers;
 }
 
 /*

Reply via email to