mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
f63f2bfdfa
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.
250 lines
6.6 KiB
C
250 lines
6.6 KiB
C
/*
|
|
* clnt_raw.c
|
|
*
|
|
* 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.
|
|
*
|
|
* Memory based rpc for simple testing and timing.
|
|
* Interface to create an rpc client and server in the same process.
|
|
* This lets us simulate rpc and get round trip overhead, without
|
|
* any interference from the kernel.
|
|
*/
|
|
|
|
#include <rpc/rpc.h>
|
|
#include <rpc/svc.h>
|
|
#include <rpc/xdr.h>
|
|
#include <libintl.h>
|
|
|
|
#define MCALL_MSG_SIZE 24
|
|
|
|
/*
|
|
* This is the "network" we will be moving stuff over.
|
|
*/
|
|
struct clntraw_private_s
|
|
{
|
|
CLIENT client_object;
|
|
XDR xdr_stream;
|
|
char _raw_buf[UDPMSGSIZE];
|
|
union
|
|
{
|
|
char msg[MCALL_MSG_SIZE];
|
|
u_long rm_xid;
|
|
} mashl_callmsg;
|
|
u_int mcnt;
|
|
};
|
|
#ifdef _RPC_THREAD_SAFE_
|
|
#define clntraw_private RPC_THREAD_VARIABLE(clntraw_private_s)
|
|
#else
|
|
static struct clntraw_private_s *clntraw_private;
|
|
#endif
|
|
|
|
static enum clnt_stat clntraw_call (CLIENT *, u_long, xdrproc_t, caddr_t,
|
|
xdrproc_t, caddr_t, struct timeval);
|
|
static void clntraw_abort (void);
|
|
static void clntraw_geterr (CLIENT *, struct rpc_err *);
|
|
static bool_t clntraw_freeres (CLIENT *, xdrproc_t, caddr_t);
|
|
static bool_t clntraw_control (CLIENT *, int, char *);
|
|
static void clntraw_destroy (CLIENT *);
|
|
|
|
static const struct clnt_ops client_ops =
|
|
{
|
|
clntraw_call,
|
|
clntraw_abort,
|
|
clntraw_geterr,
|
|
clntraw_freeres,
|
|
clntraw_destroy,
|
|
clntraw_control
|
|
};
|
|
|
|
/*
|
|
* Create a client handle for memory based rpc.
|
|
*/
|
|
CLIENT *
|
|
clntraw_create (u_long prog, u_long vers)
|
|
{
|
|
struct clntraw_private_s *clp = clntraw_private;
|
|
struct rpc_msg call_msg;
|
|
XDR *xdrs;
|
|
CLIENT *client;
|
|
|
|
if (clp == 0)
|
|
{
|
|
clp = (struct clntraw_private_s *) calloc (1, sizeof (*clp));
|
|
if (clp == 0)
|
|
return (0);
|
|
clntraw_private = clp;
|
|
}
|
|
xdrs = &clp->xdr_stream;
|
|
client = &clp->client_object;
|
|
/*
|
|
* pre-serialize the static part of the call msg and stash it away
|
|
*/
|
|
call_msg.rm_direction = CALL;
|
|
call_msg.rm_call.cb_rpcvers = RPC_MSG_VERSION;
|
|
call_msg.rm_call.cb_prog = prog;
|
|
call_msg.rm_call.cb_vers = vers;
|
|
xdrmem_create (xdrs, clp->mashl_callmsg.msg, MCALL_MSG_SIZE, XDR_ENCODE);
|
|
if (!xdr_callhdr (xdrs, &call_msg))
|
|
{
|
|
perror (_ ("clnt_raw.c: fatal header serialization error"));
|
|
}
|
|
clp->mcnt = XDR_GETPOS (xdrs);
|
|
XDR_DESTROY (xdrs);
|
|
|
|
/*
|
|
* Set xdrmem for client/server shared buffer
|
|
*/
|
|
xdrmem_create (xdrs, clp->_raw_buf, UDPMSGSIZE, XDR_FREE);
|
|
|
|
/*
|
|
* create client handle
|
|
*/
|
|
client->cl_ops = (struct clnt_ops *) &client_ops;
|
|
client->cl_auth = authnone_create ();
|
|
return client;
|
|
}
|
|
libc_hidden_nolink_sunrpc (clntraw_create, GLIBC_2_0)
|
|
|
|
static enum clnt_stat
|
|
clntraw_call (CLIENT *h, u_long proc, xdrproc_t xargs, caddr_t argsp,
|
|
xdrproc_t xresults, caddr_t resultsp, struct timeval timeout)
|
|
{
|
|
struct clntraw_private_s *clp = clntraw_private;
|
|
XDR *xdrs = &clp->xdr_stream;
|
|
struct rpc_msg msg;
|
|
enum clnt_stat status;
|
|
struct rpc_err error;
|
|
|
|
if (clp == NULL)
|
|
return RPC_FAILED;
|
|
call_again:
|
|
/*
|
|
* send request
|
|
*/
|
|
xdrs->x_op = XDR_ENCODE;
|
|
XDR_SETPOS (xdrs, 0);
|
|
/* Just checking the union definition to access rm_xid is correct. */
|
|
if (offsetof (struct rpc_msg, rm_xid) != 0)
|
|
abort ();
|
|
clp->mashl_callmsg.rm_xid++;
|
|
if ((!XDR_PUTBYTES (xdrs, clp->mashl_callmsg.msg, clp->mcnt)) ||
|
|
(!XDR_PUTLONG (xdrs, (long *) &proc)) ||
|
|
(!AUTH_MARSHALL (h->cl_auth, xdrs)) ||
|
|
(!(*xargs) (xdrs, argsp)))
|
|
{
|
|
return (RPC_CANTENCODEARGS);
|
|
}
|
|
(void) XDR_GETPOS (xdrs); /* called just to cause overhead */
|
|
|
|
/*
|
|
* We have to call server input routine here because this is
|
|
* all going on in one process. Yuk.
|
|
*/
|
|
svc_getreq (1);
|
|
|
|
/*
|
|
* get results
|
|
*/
|
|
xdrs->x_op = XDR_DECODE;
|
|
XDR_SETPOS (xdrs, 0);
|
|
msg.acpted_rply.ar_verf = _null_auth;
|
|
msg.acpted_rply.ar_results.where = resultsp;
|
|
msg.acpted_rply.ar_results.proc = xresults;
|
|
if (!xdr_replymsg (xdrs, &msg))
|
|
return RPC_CANTDECODERES;
|
|
_seterr_reply (&msg, &error);
|
|
status = error.re_status;
|
|
|
|
if (status == RPC_SUCCESS)
|
|
{
|
|
if (!AUTH_VALIDATE (h->cl_auth, &msg.acpted_rply.ar_verf))
|
|
{
|
|
status = RPC_AUTHERROR;
|
|
}
|
|
} /* end successful completion */
|
|
else
|
|
{
|
|
if (AUTH_REFRESH (h->cl_auth))
|
|
goto call_again;
|
|
} /* end of unsuccessful completion */
|
|
|
|
if (status == RPC_SUCCESS)
|
|
{
|
|
if (!AUTH_VALIDATE (h->cl_auth, &msg.acpted_rply.ar_verf))
|
|
{
|
|
status = RPC_AUTHERROR;
|
|
}
|
|
if (msg.acpted_rply.ar_verf.oa_base != NULL)
|
|
{
|
|
xdrs->x_op = XDR_FREE;
|
|
(void) xdr_opaque_auth (xdrs, &(msg.acpted_rply.ar_verf));
|
|
}
|
|
}
|
|
|
|
return status;
|
|
}
|
|
|
|
static void
|
|
clntraw_geterr (CLIENT *cl, struct rpc_err *err)
|
|
{
|
|
}
|
|
|
|
|
|
static bool_t
|
|
clntraw_freeres (CLIENT *cl, xdrproc_t xdr_res, caddr_t res_ptr)
|
|
{
|
|
struct clntraw_private_s *clp = clntraw_private;
|
|
XDR *xdrs = &clp->xdr_stream;
|
|
bool_t rval;
|
|
|
|
if (clp == NULL)
|
|
{
|
|
rval = (bool_t) RPC_FAILED;
|
|
return rval;
|
|
}
|
|
xdrs->x_op = XDR_FREE;
|
|
return (*xdr_res) (xdrs, res_ptr);
|
|
}
|
|
|
|
static void
|
|
clntraw_abort (void)
|
|
{
|
|
}
|
|
|
|
static bool_t
|
|
clntraw_control (CLIENT *cl, int i, char *c)
|
|
{
|
|
return FALSE;
|
|
}
|
|
|
|
static void
|
|
clntraw_destroy (CLIENT *cl)
|
|
{
|
|
}
|