Module Name: src
Committed By: mrg
Date: Mon Jul 4 11:01:41 UTC 2011
Modified Files:
src/lib/libc/rpc: xdr_sizeof.c
Log Message:
insert some (uintptr_t) between int and pointer casts.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/rpc/xdr_sizeof.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/rpc/xdr_sizeof.c
diff -u src/lib/libc/rpc/xdr_sizeof.c:1.1 src/lib/libc/rpc/xdr_sizeof.c:1.2
--- src/lib/libc/rpc/xdr_sizeof.c:1.1 Mon Jul 4 07:54:38 2011
+++ src/lib/libc/rpc/xdr_sizeof.c Mon Jul 4 11:01:40 2011
@@ -39,7 +39,7 @@
#if 0
__FBSDID("$FreeBSD: src/lib/libc/xdr/xdr_sizeof.c,v 1.5.38.1 2010/12/21 17:10:29 kensmith Exp $");
#else
-__RCSID("$NetBSD: xdr_sizeof.c,v 1.1 2011/07/04 07:54:38 manu Exp $");
+__RCSID("$NetBSD: xdr_sizeof.c,v 1.2 2011/07/04 11:01:40 mrg Exp $");
#endif
#include "namespace.h"
@@ -109,7 +109,7 @@
if (xdrs->x_op != XDR_ENCODE) {
return (NULL);
}
- if (len < (u_int)xdrs->x_base) {
+ if (len < (u_int)(uintptr_t)xdrs->x_base) {
/* x_private was already allocated */
xdrs->x_handy += len;
return ((int32_t *) xdrs->x_private);
@@ -121,7 +121,7 @@
xdrs->x_base = 0;
return (NULL);
}
- xdrs->x_base = (caddr_t) len;
+ xdrs->x_base = (caddr_t)(uintptr_t)len;
xdrs->x_handy += len;
return ((int32_t *) xdrs->x_private);
}
