diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | sunrpc/auth_des.c | 4 | ||||
| -rw-r--r-- | sunrpc/clnt_tcp.c | 4 | ||||
| -rw-r--r-- | sunrpc/clnt_udp.c | 4 | ||||
| -rw-r--r-- | sunrpc/clnt_unix.c | 4 | ||||
| -rw-r--r-- | sunrpc/svc_raw.c | 4 |
6 files changed, 17 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog index 45338a1987..0e83532ba6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,7 +14,13 @@ 2005-12-20 Ulrich Drepper <drepper@redhat.com> - * sunrpc/auth_unix.c (auth_unix_ops): Mark as const. + * sunrpc/clnt_unix.c (unix_ops): Mark as const. + * sunrpc/auth_des.c (authdes_ops): Likewise. + * sunrpc/svc_raw.c (server_ops): Likewise. + * sunrpc/clnt_udp.c (udp_ops): Likewise. + * sunrpc/clnt_tcp.c (tcp_ops): Likewise. + * sunrpc/clnt_raw.c (client_ops): Likewise. + * sunrpc/auth_unix.c (auth_unix_ops): Likewise. * sunrpc/auth_none.c (ops): Likewise. * nss/nsswitch.c (databases): Mark as const. Change name field diff --git a/sunrpc/auth_des.c b/sunrpc/auth_des.c index dbd12e5aad..a76f0278ce 100644 --- a/sunrpc/auth_des.c +++ b/sunrpc/auth_des.c @@ -66,7 +66,7 @@ static void authdes_destroy (AUTH *); static bool_t synchronize (struct sockaddr *, struct rpc_timeval *) internal_function; -static struct auth_ops authdes_ops = { +static const struct auth_ops authdes_ops = { authdes_nextverf, authdes_marshal, authdes_validate, @@ -185,7 +185,7 @@ authdes_pk_create (const char *servername, netobj *pkey, u_int window, */ auth->ah_cred.oa_flavor = AUTH_DES; auth->ah_verf.oa_flavor = AUTH_DES; - auth->ah_ops = &authdes_ops; + auth->ah_ops = (struct auth_ops *) &authdes_ops; auth->ah_private = (caddr_t) ad; if (!authdes_refresh (auth)) diff --git a/sunrpc/clnt_tcp.c b/sunrpc/clnt_tcp.c index 095baa87aa..5bec3bcf3a 100644 --- a/sunrpc/clnt_tcp.c +++ b/sunrpc/clnt_tcp.c @@ -91,7 +91,7 @@ static bool_t clnttcp_freeres (CLIENT *, xdrproc_t, caddr_t); static bool_t clnttcp_control (CLIENT *, int, char *); static void clnttcp_destroy (CLIENT *); -static struct clnt_ops tcp_ops = +static const struct clnt_ops tcp_ops = { clnttcp_call, clnttcp_abort, @@ -213,7 +213,7 @@ clnttcp_create (struct sockaddr_in *raddr, u_long prog, u_long vers, */ INTUSE(xdrrec_create) (&(ct->ct_xdrs), sendsz, recvsz, (caddr_t) ct, readtcp, writetcp); - h->cl_ops = &tcp_ops; + h->cl_ops = (struct clnt_ops *) &tcp_ops; h->cl_private = (caddr_t) ct; h->cl_auth = INTUSE(authnone_create) (); return h; diff --git a/sunrpc/clnt_udp.c b/sunrpc/clnt_udp.c index f4a46b5036..8c24677c83 100644 --- a/sunrpc/clnt_udp.c +++ b/sunrpc/clnt_udp.c @@ -74,7 +74,7 @@ static bool_t clntudp_freeres (CLIENT *, xdrproc_t, caddr_t); static bool_t clntudp_control (CLIENT *, int, char *); static void clntudp_destroy (CLIENT *); -static struct clnt_ops udp_ops = +static const struct clnt_ops udp_ops = { clntudp_call, clntudp_abort, @@ -153,7 +153,7 @@ clntudp_bufcreate (struct sockaddr_in *raddr, u_long program, u_long version, } raddr->sin_port = htons (port); } - cl->cl_ops = &udp_ops; + cl->cl_ops = (struct clnt_ops *) &udp_ops; cl->cl_private = (caddr_t) cu; cu->cu_raddr = *raddr; cu->cu_rlen = sizeof (cu->cu_raddr); diff --git a/sunrpc/clnt_unix.c b/sunrpc/clnt_unix.c index 4e93e0d855..848a480581 100644 --- a/sunrpc/clnt_unix.c +++ b/sunrpc/clnt_unix.c @@ -88,7 +88,7 @@ static bool_t clntunix_freeres (CLIENT *, xdrproc_t, caddr_t); static bool_t clntunix_control (CLIENT *, int, char *); static void clntunix_destroy (CLIENT *); -static struct clnt_ops unix_ops = +static const struct clnt_ops unix_ops = { clntunix_call, clntunix_abort, @@ -192,7 +192,7 @@ clntunix_create (struct sockaddr_un *raddr, u_long prog, u_long vers, */ INTUSE(xdrrec_create) (&(ct->ct_xdrs), sendsz, recvsz, (caddr_t) ct, readunix, writeunix); - h->cl_ops = &unix_ops; + h->cl_ops = (struct clnt_ops *) &unix_ops; h->cl_private = (caddr_t) ct; h->cl_auth = INTUSE(authnone_create) (); return h; diff --git a/sunrpc/svc_raw.c b/sunrpc/svc_raw.c index 37a027d412..ff8fa7ccd9 100644 --- a/sunrpc/svc_raw.c +++ b/sunrpc/svc_raw.c @@ -66,7 +66,7 @@ static bool_t svcraw_reply (SVCXPRT *, struct rpc_msg *); static bool_t svcraw_freeargs (SVCXPRT *, xdrproc_t, caddr_t); static void svcraw_destroy (SVCXPRT *); -static struct xp_ops server_ops = +static const struct xp_ops server_ops = { svcraw_recv, svcraw_stat, @@ -89,7 +89,7 @@ svcraw_create (void) } srp->server.xp_sock = 0; srp->server.xp_port = 0; - srp->server.xp_ops = &server_ops; + srp->server.xp_ops = (struct xp_ops *) &server_ops; srp->server.xp_verf.oa_base = srp->verf_body; INTUSE(xdrmem_create) (&srp->xdr_stream, srp->_raw_buf, UDPMSGSIZE, XDR_FREE); |