Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/lib/libc/rpc insert some (uintptr_t) between int and pointer...



details:   https://anonhg.NetBSD.org/src/rev/78684a9f0ab0
branches:  trunk
changeset: 766925:78684a9f0ab0
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Jul 04 11:01:40 2011 +0000

description:
insert some (uintptr_t) between int and pointer casts.

diffstat:

 lib/libc/rpc/xdr_sizeof.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (30 lines):

diff -r 5c4cb619d821 -r 78684a9f0ab0 lib/libc/rpc/xdr_sizeof.c
--- a/lib/libc/rpc/xdr_sizeof.c Mon Jul 04 09:29:37 2011 +0000
+++ b/lib/libc/rpc/xdr_sizeof.c Mon Jul 04 11:01:40 2011 +0000
@@ -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);
        }



Home | Main Index | Thread Index | Old Index