mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-24 10:22:41 +08:00
d9fee042e2
This patch changes the remaining uses of the old nonstandard u_intN_t types in glibc to use the C99 uintN_t instead, except for the definitions of those typedefs and the tests of them in the c++-types test. This follows the previous such fix for libm, and being consistent in using uintN_t makes sense as a global cleanup. Tested for x86_64, and with build-many-glibcs.py. * catgets/catgets.c (catgets): Use uintN_t instead of u_intN_t. * catgets/catgetsinfo.h (struct catalog_obj): Likewise. (struct catalog_info): Likewise. * inet/htontest.c (lo): Likewise. (foo): Likewise. * inet/inet_lnaof.c (inet_lnaof): Likewise. * inet/inet_net.c (inet_network): Likewise. * inet/inet_netof.c (inet_netof): Likewise. * inet/rcmd.c (__ivaliduser): Likewise. (iruserok): Likewise. * locale/loadlocale.c (_nl_intern_locale_data): Likewise. * locale/programs/locale-spec.c (locale_special): Likewise. * nis/nis_findserv.c (struct findserv_req): Likewise. (__nis_findfastest_with_timeout): Likewise. * nss/test-netdb.c (test_network): Likewise. * resolv/inet_neta.c (inet_neta): Likewise. * resolv/ns_date.c (ns_datetosecs): Likewise. (SECS_PER_DAY): Likewise. * resolv/nss_dns/dns-network.c (_nss_dns_getnetbyaddr_r): Likewise. * resolv/res_comp.c (__putlong): Likewise. (__putshort): Likewise. (_getlong): Likewise. (_getshort): Likewise. * resolv/res_debug.c (p_time): Likewise. (precsize_ntoa): Likewise. (precsize_aton): Likewise. (latlon2ul): Likewise. (loc_aton): Likewise. (loc_ntoa): Likewise. * resolv/res_hconf.c (struct netaddr): Likewise. (_res_hconf_reorder_addrs): Likewise. * sunrpc/clnt_tcp.c (clnttcp_call): Likewise. (clnttcp_control): Likewise. * sunrpc/clnt_udp.c (clntudp_call): Likewise. (clntudp_control): Likewise. * sunrpc/clnt_unix.c (clntunix_call): Likewise. (clntunix_control): Likewise. * sunrpc/pmap_rmt.c (clnt_broadcast): Likewise. * sunrpc/rpc/auth.h (union des_block): Likewise. * sunrpc/tst-udp-nonblocking.c (do_test): Likewise. * sunrpc/xdr_rec.c (struct rec_strm): Likewise. (xdrrec_create): Likewise. (xdrrec_endofrecord): Likewise. (flush_out): Likewise. * sunrpc/xdr_stdio.c (xdrstdio_getlong): Likewise. (xdrstdio_putlong): Likewise. * sysdeps/unix/sysv/linux/errqueue.h (struct sock_extended_err): Likewise.
198 lines
5.9 KiB
C
198 lines
5.9 KiB
C
/*
|
|
* xdr_stdio.c, XDR implementation on standard i/o file.
|
|
*
|
|
* Copyright (c) 2010, Oracle America, Inc.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions are
|
|
* met:
|
|
*
|
|
* * Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* * Redistributions in binary form must reproduce the above
|
|
* copyright notice, this list of conditions and the following
|
|
* disclaimer in the documentation and/or other materials
|
|
* provided with the distribution.
|
|
* * Neither the name of the "Oracle America, Inc." nor the names of its
|
|
* contributors may be used to endorse or promote products derived
|
|
* from this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
|
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
|
* COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
|
|
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
|
|
* GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
|
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
|
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*
|
|
* This set of routines implements a XDR on a stdio stream.
|
|
* XDR_ENCODE serializes onto the stream, XDR_DECODE de-serializes
|
|
* from the stream.
|
|
*/
|
|
|
|
#include <rpc/types.h>
|
|
#include <stdio.h>
|
|
#include <rpc/xdr.h>
|
|
|
|
#include <libio/iolibio.h>
|
|
#include <shlib-compat.h>
|
|
|
|
#define fflush(s) _IO_fflush (s)
|
|
#define fread(p, m, n, s) _IO_fread (p, m, n, s)
|
|
#define ftell(s) _IO_ftell (s)
|
|
#define fwrite(p, m, n, s) _IO_fwrite (p, m, n, s)
|
|
|
|
static bool_t xdrstdio_getlong (XDR *, long *);
|
|
static bool_t xdrstdio_putlong (XDR *, const long *);
|
|
static bool_t xdrstdio_getbytes (XDR *, caddr_t, u_int);
|
|
static bool_t xdrstdio_putbytes (XDR *, const char *, u_int);
|
|
static u_int xdrstdio_getpos (const XDR *);
|
|
static bool_t xdrstdio_setpos (XDR *, u_int);
|
|
static int32_t *xdrstdio_inline (XDR *, u_int);
|
|
static void xdrstdio_destroy (XDR *);
|
|
static bool_t xdrstdio_getint32 (XDR *, int32_t *);
|
|
static bool_t xdrstdio_putint32 (XDR *, const int32_t *);
|
|
|
|
/*
|
|
* Ops vector for stdio type XDR
|
|
*/
|
|
static const struct xdr_ops xdrstdio_ops =
|
|
{
|
|
xdrstdio_getlong, /* deserialize a long int */
|
|
xdrstdio_putlong, /* serialize a long int */
|
|
xdrstdio_getbytes, /* deserialize counted bytes */
|
|
xdrstdio_putbytes, /* serialize counted bytes */
|
|
xdrstdio_getpos, /* get offset in the stream */
|
|
xdrstdio_setpos, /* set offset in the stream */
|
|
xdrstdio_inline, /* prime stream for inline macros */
|
|
xdrstdio_destroy, /* destroy stream */
|
|
xdrstdio_getint32, /* deserialize a int */
|
|
xdrstdio_putint32 /* serialize a int */
|
|
};
|
|
|
|
/*
|
|
* Initialize a stdio xdr stream.
|
|
* Sets the xdr stream handle xdrs for use on the stream file.
|
|
* Operation flag is set to op.
|
|
*/
|
|
void
|
|
xdrstdio_create (XDR *xdrs, FILE *file, enum xdr_op op)
|
|
{
|
|
xdrs->x_op = op;
|
|
/* We have to add the const since the `struct xdr_ops' in `struct XDR'
|
|
is not `const'. */
|
|
xdrs->x_ops = (struct xdr_ops *) &xdrstdio_ops;
|
|
xdrs->x_private = (caddr_t) file;
|
|
xdrs->x_handy = 0;
|
|
xdrs->x_base = 0;
|
|
}
|
|
|
|
/*
|
|
* Destroy a stdio xdr stream.
|
|
* Cleans up the xdr stream handle xdrs previously set up by xdrstdio_create.
|
|
*/
|
|
static void
|
|
xdrstdio_destroy (XDR *xdrs)
|
|
{
|
|
(void) fflush ((FILE *) xdrs->x_private);
|
|
/* xx should we close the file ?? */
|
|
};
|
|
|
|
static bool_t
|
|
xdrstdio_getlong (XDR *xdrs, long *lp)
|
|
{
|
|
uint32_t mycopy;
|
|
|
|
if (fread ((caddr_t) &mycopy, 4, 1, (FILE *) xdrs->x_private) != 1)
|
|
return FALSE;
|
|
*lp = (long) ntohl (mycopy);
|
|
return TRUE;
|
|
}
|
|
|
|
static bool_t
|
|
xdrstdio_putlong (XDR *xdrs, const long *lp)
|
|
{
|
|
int32_t mycopy = htonl ((uint32_t) *lp);
|
|
|
|
if (fwrite ((caddr_t) &mycopy, 4, 1, (FILE *) xdrs->x_private) != 1)
|
|
return FALSE;
|
|
return TRUE;
|
|
}
|
|
|
|
static bool_t
|
|
xdrstdio_getbytes (XDR *xdrs, const caddr_t addr, u_int len)
|
|
{
|
|
if ((len != 0) && (fread (addr, (int) len, 1,
|
|
(FILE *) xdrs->x_private) != 1))
|
|
return FALSE;
|
|
return TRUE;
|
|
}
|
|
|
|
static bool_t
|
|
xdrstdio_putbytes (XDR *xdrs, const char *addr, u_int len)
|
|
{
|
|
if ((len != 0) && (fwrite (addr, (int) len, 1,
|
|
(FILE *) xdrs->x_private) != 1))
|
|
return FALSE;
|
|
return TRUE;
|
|
}
|
|
|
|
static u_int
|
|
xdrstdio_getpos (const XDR *xdrs)
|
|
{
|
|
return (u_int) ftell ((FILE *) xdrs->x_private);
|
|
}
|
|
|
|
static bool_t
|
|
xdrstdio_setpos (XDR *xdrs, u_int pos)
|
|
{
|
|
return fseek ((FILE *) xdrs->x_private, (long) pos, 0) < 0 ? FALSE : TRUE;
|
|
}
|
|
|
|
static int32_t *
|
|
xdrstdio_inline (XDR *xdrs, u_int len)
|
|
{
|
|
/*
|
|
* Must do some work to implement this: must insure
|
|
* enough data in the underlying stdio buffer,
|
|
* that the buffer is aligned so that we can indirect through a
|
|
* long *, and stuff this pointer in xdrs->x_buf. Doing
|
|
* a fread or fwrite to a scratch buffer would defeat
|
|
* most of the gains to be had here and require storage
|
|
* management on this buffer, so we don't do this.
|
|
*/
|
|
return NULL;
|
|
}
|
|
|
|
static bool_t
|
|
xdrstdio_getint32 (XDR *xdrs, int32_t *ip)
|
|
{
|
|
int32_t mycopy;
|
|
|
|
if (fread ((caddr_t) &mycopy, 4, 1, (FILE *) xdrs->x_private) != 1)
|
|
return FALSE;
|
|
*ip = ntohl (mycopy);
|
|
return TRUE;
|
|
}
|
|
|
|
static bool_t
|
|
xdrstdio_putint32 (XDR *xdrs, const int32_t *ip)
|
|
{
|
|
int32_t mycopy = htonl (*ip);
|
|
|
|
ip = &mycopy;
|
|
if (fwrite ((caddr_t) ip, 4, 1, (FILE *) xdrs->x_private) != 1)
|
|
return FALSE;
|
|
return TRUE;
|
|
}
|
|
#ifdef EXPORT_RPC_SYMBOLS
|
|
libc_hidden_def (xdrstdio_create)
|
|
#else
|
|
libc_hidden_nolink_sunrpc (xdrstdio_create, GLIBC_2_0)
|
|
#endif
|