diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2007-07-12 18:26:36 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2007-07-12 18:26:36 +0000 |
| commit | 0ecb606cb6cf65de1d9fc8a919bceb4be476c602 (patch) | |
| tree | 2ea1f8305970753e4a657acb2ccc15ca3eec8e2c /sunrpc/xdr_intXX_t.c | |
| parent | 7d58530341304d403a6626d7f7a1913165fe2f32 (diff) | |
| download | glibc-0ecb606cb6cf65de1d9fc8a919bceb4be476c602.tar.gz glibc-0ecb606cb6cf65de1d9fc8a919bceb4be476c602.tar.xz glibc-0ecb606cb6cf65de1d9fc8a919bceb4be476c602.zip | |
2.5-18.1
Diffstat (limited to 'sunrpc/xdr_intXX_t.c')
| -rw-r--r-- | sunrpc/xdr_intXX_t.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sunrpc/xdr_intXX_t.c b/sunrpc/xdr_intXX_t.c index 9d2f92e10d..6c1fca2b23 100644 --- a/sunrpc/xdr_intXX_t.c +++ b/sunrpc/xdr_intXX_t.c @@ -1,4 +1,4 @@ -/* Copyright (c) 1998, 1999, 2000, 2004 Free Software Foundation, Inc. +/* Copyright (c) 1998, 1999, 2000, 2004, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1998. @@ -31,10 +31,7 @@ bool_t xdr_int64_t (XDR *xdrs, int64_t *ip) { - int32_t t1; - /* This must be unsigned, otherwise we get problems with sign - extension in the DECODE case. */ - uint32_t t2; + int32_t t1, t2; switch (xdrs->x_op) { @@ -46,7 +43,7 @@ xdr_int64_t (XDR *xdrs, int64_t *ip) if (!XDR_GETINT32(xdrs, &t1) || !XDR_GETINT32(xdrs, &t2)) return FALSE; *ip = ((int64_t) t1) << 32; - *ip |= t2; + *ip |= (uint32_t) t2; /* Avoid sign extension. */ return TRUE; case XDR_FREE: return TRUE; |