mirror of
https://sourceware.org/git/glibc.git
synced 2025-06-03 13:22:05 +03:00
This automatically-generated patch converts 69 function definitions in glibc from old-style K&R to prototype-style. This patch, covering both sysdeps and non-sysdeps files, deals with cases where the prototype needed to be wrapped over more than one line. Otherwise, exclusions and caveats are as for <https://sourceware.org/ml/libc-alpha/2015-10/msg00594.html> and <https://sourceware.org/ml/libc-alpha/2015-10/msg00599.html>. Tested for x86_64 and x86 (testsuite, and that installed stripped shared libraries are unchanged by the patch). * crypt/crypt-entry.c (__crypt_r): Convert to prototype-style function definition. * crypt/crypt_util.c (__encrypt_r): Likewise. * libio/genops.c (_IO_no_init): Likewise. * libio/iofopncook.c (_IO_fopencookie): Likewise. (_IO_old_fopencookie): Likewise. * libio/iofwrite_u.c (fwrite_unlocked): Likewise. * libio/iogetline.c (_IO_getline): Likewise. (_IO_getline_info): Likewise. * libio/iogetwline.c (_IO_getwline): Likewise. (_IO_getwline_info): Likewise. * libio/vsnprintf.c (_IO_vsnprintf): Likewise. * libio/vswprintf.c (_IO_vswprintf): Likewise. * locale/programs/simple-hash.c (insert_entry_2): Likewise. (find_entry): Likewise. (iterate_table): Likewise. (lookup): Likewise. * login/forkpty.c (forkpty): Likewise. * misc/hsearch_r.c (__hsearch_r): Likewise. * misc/select.c (__select): Likewise. * nptl/cleanup_defer_compat.c (_pthread_cleanup_pop_restore): Likewise. * nptl/old_pthread_cond_init.c (__pthread_cond_init_2_0): Likewise. * nptl/old_pthread_cond_timedwait.c (__pthread_cond_timedwait_2_0): Likewise. * nptl/pthread_barrier_init.c (__pthread_barrier_init): Likewise. * nptl/pthread_barrierattr_getpshared.c (pthread_barrierattr_getpshared): Likewise. * nptl/pthread_getschedparam.c (__pthread_getschedparam): Likewise. * nptl/pthread_mutex_setprioceiling.c (pthread_mutex_setprioceiling): Likewise. * nptl/pthread_mutexattr_getprioceiling.c (pthread_mutexattr_getprioceiling): Likewise. * nptl/pthread_rwlock_init.c (__pthread_rwlock_init): Likewise. * nptl/pthread_rwlock_timedrdlock.c (pthread_rwlock_timedrdlock): Likewise. * nptl/pthread_rwlock_timedwrlock.c (pthread_rwlock_timedwrlock): Likewise. * nptl/pthread_setschedparam.c (__pthread_setschedparam): Likewise. * socket/recvfrom.c (__recvfrom): Likewise. * socket/sendto.c (__sendto): Likewise. * socket/setsockopt.c (__setsockopt): Likewise. * stdio-common/_itoa.c (_itoa): Likewise. * stdio-common/_itowa.c (_itowa): Likewise. * stdio-common/reg-printf.c (__register_printf_specifier): Likewise. (__register_printf_function): Likewise. * stdio-common/tempname.c (__path_search): Likewise. * stdlib/addmul_1.c (mpn_addmul_1): Likewise. * stdlib/mul_1.c (mpn_mul_1): Likewise. * stdlib/random_r.c (__initstate_r): Likewise. * stdlib/setenv.c (__add_to_environ): Likewise. * stdlib/submul_1.c (mpn_submul_1): Likewise. * streams/getpmsg.c (getpmsg): Likewise. * streams/putmsg.c (putmsg): Likewise. * streams/putpmsg.c (putpmsg): Likewise. * sunrpc/clnt_raw.c (clntraw_call): Likewise. * sunrpc/clnt_tcp.c (clnttcp_call): Likewise. * sunrpc/clnt_udp.c (clntudp_create): Likewise. * sunrpc/clnt_unix.c (clntunix_call): Likewise. * sunrpc/pm_getport.c (pmap_getport): Likewise. * sunrpc/svc_udp.c (cache_get): Likewise. * sunrpc/xdr_array.c (xdr_vector): Likewise. * sysdeps/mach/hurd/getcwd.c (__canonicalize_directory_name_internal): Likewise. * sysdeps/mach/hurd/pselect.c (__pselect): Likewise. * sysdeps/mach/hurd/recvfrom.c (__recvfrom): Likewise. * sysdeps/mach/hurd/select.c (__select): Likewise. * sysdeps/posix/ttyname_r.c (getttyname_r): Likewise. * sysdeps/pthread/timer_settime.c (timer_settime): Likewise. * sysdeps/sparc/nptl/pthread_barrier_init.c (__pthread_barrier_init): Likewise. * sysdeps/unix/sysv/linux/hppa/pthread_cond_timedwait.c (__pthread_cond_timedwait): Likewise. * sysdeps/unix/sysv/linux/i386/putmsg.c (putmsg): Likewise. * sysdeps/unix/sysv/linux/s390/semtimedop.c (semtimedop): Likewise. * sysdeps/unix/sysv/linux/semtimedop.c (semtimedop): Likewise. * sysdeps/unix/sysv/linux/timer_settime.c (timer_settime): Likewise. * sysvipc/semtimedop.c (semtimedop): Likewise. * time/setitimer.c (__setitimer): Likewise. * time/strftime_l.c (emacs_strftime): Likewise.
162 lines
4.6 KiB
C
162 lines
4.6 KiB
C
/*
|
|
* xdr_array.c, Generic XDR routines implementation.
|
|
*
|
|
* 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.
|
|
*
|
|
* These are the "non-trivial" xdr primitives used to serialize and
|
|
* de-serialize arrays. See xdr.h for more info on the interface to xdr.
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <rpc/types.h>
|
|
#include <rpc/xdr.h>
|
|
#include <libintl.h>
|
|
#include <limits.h>
|
|
#include <wchar.h>
|
|
|
|
#define LASTUNSIGNED ((u_int)0-1)
|
|
|
|
|
|
/*
|
|
* XDR an array of arbitrary elements
|
|
* *addrp is a pointer to the array, *sizep is the number of elements.
|
|
* If addrp is NULL (*sizep * elsize) bytes are allocated.
|
|
* elsize is the size (in bytes) of each element, and elproc is the
|
|
* xdr procedure to call to handle each element of the array.
|
|
*/
|
|
bool_t
|
|
xdr_array (xdrs, addrp, sizep, maxsize, elsize, elproc)
|
|
XDR *xdrs;
|
|
caddr_t *addrp; /* array pointer */
|
|
u_int *sizep; /* number of elements */
|
|
u_int maxsize; /* max numberof elements */
|
|
u_int elsize; /* size in bytes of each element */
|
|
xdrproc_t elproc; /* xdr routine to handle each element */
|
|
{
|
|
u_int i;
|
|
caddr_t target = *addrp;
|
|
u_int c; /* the actual element count */
|
|
bool_t stat = TRUE;
|
|
|
|
/* like strings, arrays are really counted arrays */
|
|
if (!xdr_u_int (xdrs, sizep))
|
|
{
|
|
return FALSE;
|
|
}
|
|
c = *sizep;
|
|
/*
|
|
* XXX: Let the overflow possibly happen with XDR_FREE because mem_free()
|
|
* doesn't actually use its second argument anyway.
|
|
*/
|
|
if ((c > maxsize || c > UINT_MAX / elsize) && (xdrs->x_op != XDR_FREE))
|
|
{
|
|
return FALSE;
|
|
}
|
|
|
|
/*
|
|
* if we are deserializing, we may need to allocate an array.
|
|
* We also save time by checking for a null array if we are freeing.
|
|
*/
|
|
if (target == NULL)
|
|
switch (xdrs->x_op)
|
|
{
|
|
case XDR_DECODE:
|
|
if (c == 0)
|
|
return TRUE;
|
|
*addrp = target = calloc (c, elsize);
|
|
if (target == NULL)
|
|
{
|
|
(void) __fxprintf (NULL, "%s: %s", __func__, _("out of memory\n"));
|
|
return FALSE;
|
|
}
|
|
break;
|
|
|
|
case XDR_FREE:
|
|
return TRUE;
|
|
default:
|
|
break;
|
|
}
|
|
|
|
/*
|
|
* now we xdr each element of array
|
|
*/
|
|
for (i = 0; (i < c) && stat; i++)
|
|
{
|
|
stat = (*elproc) (xdrs, target, LASTUNSIGNED);
|
|
target += elsize;
|
|
}
|
|
|
|
/*
|
|
* the array may need freeing
|
|
*/
|
|
if (xdrs->x_op == XDR_FREE)
|
|
{
|
|
mem_free (*addrp, c * elsize);
|
|
*addrp = NULL;
|
|
}
|
|
return stat;
|
|
}
|
|
#ifdef EXPORT_RPC_SYMBOLS
|
|
libc_hidden_def (xdr_array)
|
|
#else
|
|
libc_hidden_nolink_sunrpc (xdr_array, GLIBC_2_0)
|
|
#endif
|
|
|
|
/*
|
|
* xdr_vector():
|
|
*
|
|
* XDR a fixed length array. Unlike variable-length arrays,
|
|
* the storage of fixed length arrays is static and unfreeable.
|
|
* > basep: base of the array
|
|
* > size: size of the array
|
|
* > elemsize: size of each element
|
|
* > xdr_elem: routine to XDR each element
|
|
*/
|
|
bool_t
|
|
xdr_vector (XDR *xdrs, char *basep, u_int nelem, u_int elemsize,
|
|
xdrproc_t xdr_elem)
|
|
{
|
|
u_int i;
|
|
char *elptr;
|
|
|
|
elptr = basep;
|
|
for (i = 0; i < nelem; i++)
|
|
{
|
|
if (!(*xdr_elem) (xdrs, elptr, LASTUNSIGNED))
|
|
{
|
|
return FALSE;
|
|
}
|
|
elptr += elemsize;
|
|
}
|
|
return TRUE;
|
|
}
|
|
libc_hidden_nolink_sunrpc (xdr_vector, GLIBC_2_0)
|