From 714fa78bc3ae78c7dcfd846ad6c1ff93f765d93c Mon Sep 17 00:00:00 2001 From: christos Date: Mon, 16 Nov 1998 12:07:43 +0000 Subject: [PATCH] delint --- include/db.h | 38 +++++++++++++++++++------------------- include/rpc/auth.h | 4 ++-- include/rpc/clnt.h | 12 ++++++------ include/rpc/svc.h | 10 +++++----- include/rpc/xdr.h | 20 ++++++++++---------- 5 files changed, 42 insertions(+), 42 deletions(-) diff --git a/include/db.h b/include/db.h index ede1b97c8295..f790affe1552 100644 --- a/include/db.h +++ b/include/db.h @@ -1,4 +1,4 @@ -/* $NetBSD: db.h,v 1.14 1998/05/07 19:24:20 kleink Exp $ */ +/* $NetBSD: db.h,v 1.15 1998/11/16 12:07:43 christos Exp $ */ /*- * Copyright (c) 1990, 1993, 1994 @@ -180,23 +180,23 @@ typedef struct { */ #define M_32_SWAP(a) { \ u_int32_t _tmp = a; \ - ((char *)&a)[0] = ((char *)&_tmp)[3]; \ - ((char *)&a)[1] = ((char *)&_tmp)[2]; \ - ((char *)&a)[2] = ((char *)&_tmp)[1]; \ - ((char *)&a)[3] = ((char *)&_tmp)[0]; \ + ((char *)(void *)&a)[0] = ((char *)(void *)&_tmp)[3]; \ + ((char *)(void *)&a)[1] = ((char *)(void *)&_tmp)[2]; \ + ((char *)(void *)&a)[2] = ((char *)(void *)&_tmp)[1]; \ + ((char *)(void *)&a)[3] = ((char *)(void *)&_tmp)[0]; \ } #define P_32_SWAP(a) { \ u_int32_t _tmp = *(u_int32_t *)a; \ - ((char *)a)[0] = ((char *)&_tmp)[3]; \ - ((char *)a)[1] = ((char *)&_tmp)[2]; \ - ((char *)a)[2] = ((char *)&_tmp)[1]; \ - ((char *)a)[3] = ((char *)&_tmp)[0]; \ + ((char *)(void *)a)[0] = ((char *)(void *)&_tmp)[3]; \ + ((char *)(void *)a)[1] = ((char *)(void *)&_tmp)[2]; \ + ((char *)(void *)a)[2] = ((char *)(void *)&_tmp)[1]; \ + ((char *)(void *)a)[3] = ((char *)(void *)&_tmp)[0]; \ } #define P_32_COPY(a, b) { \ - ((char *)&(b))[0] = ((char *)&(a))[3]; \ - ((char *)&(b))[1] = ((char *)&(a))[2]; \ - ((char *)&(b))[2] = ((char *)&(a))[1]; \ - ((char *)&(b))[3] = ((char *)&(a))[0]; \ + ((char *)(void *)&(b))[0] = ((char *)(void *)&(a))[3]; \ + ((char *)(void *)&(b))[1] = ((char *)(void *)&(a))[2]; \ + ((char *)(void *)&(b))[2] = ((char *)(void *)&(a))[1]; \ + ((char *)(void *)&(b))[3] = ((char *)(void *)&(a))[0]; \ } /* @@ -207,17 +207,17 @@ typedef struct { */ #define M_16_SWAP(a) { \ u_int16_t _tmp = a; \ - ((char *)&a)[0] = ((char *)&_tmp)[1]; \ - ((char *)&a)[1] = ((char *)&_tmp)[0]; \ + ((char *)(void *)&a)[0] = ((char *)(void *)&_tmp)[1]; \ + ((char *)(void *)&a)[1] = ((char *)(void *)&_tmp)[0]; \ } #define P_16_SWAP(a) { \ u_int16_t _tmp = *(u_int16_t *)a; \ - ((char *)a)[0] = ((char *)&_tmp)[1]; \ - ((char *)a)[1] = ((char *)&_tmp)[0]; \ + ((char *)(void *)a)[0] = ((char *)(void *)&_tmp)[1]; \ + ((char *)(void *)a)[1] = ((char *)(void *)&_tmp)[0]; \ } #define P_16_COPY(a, b) { \ - ((char *)&(b))[0] = ((char *)&(a))[1]; \ - ((char *)&(b))[1] = ((char *)&(a))[0]; \ + ((char *)(void *)&(b))[0] = ((char *)(void *)&(a))[1]; \ + ((char *)(void *)&(b))[1] = ((char *)(void *)&(a))[0]; \ } #endif diff --git a/include/rpc/auth.h b/include/rpc/auth.h index 11a5664c2d9a..7170a2965389 100644 --- a/include/rpc/auth.h +++ b/include/rpc/auth.h @@ -1,4 +1,4 @@ -/* $NetBSD: auth.h,v 1.13 1998/07/26 11:37:23 mycroft Exp $ */ +/* $NetBSD: auth.h,v 1.14 1998/11/16 12:07:43 christos Exp $ */ /* * Sun RPC is a product of Sun Microsystems, Inc. and is provided for @@ -112,7 +112,7 @@ typedef struct __rpc_auth { /* destroy this structure */ void (*ah_destroy) __P((struct __rpc_auth *)); } *ah_ops; - caddr_t ah_private; + void *ah_private; } AUTH; diff --git a/include/rpc/clnt.h b/include/rpc/clnt.h index f30fc2cc0789..e7e5fc37da6b 100644 --- a/include/rpc/clnt.h +++ b/include/rpc/clnt.h @@ -1,4 +1,4 @@ -/* $NetBSD: clnt.h,v 1.12 1998/07/26 11:45:21 mycroft Exp $ */ +/* $NetBSD: clnt.h,v 1.13 1998/11/16 12:07:43 christos Exp $ */ /* * Sun RPC is a product of Sun Microsystems, Inc. and is provided for @@ -136,7 +136,7 @@ typedef struct __rpc_client { bool_t (*cl_control) __P((struct __rpc_client *, u_int, char *)); } *cl_ops; - caddr_t cl_private; /* private stuff */ + void *cl_private; /* private stuff */ } CLIENT; @@ -159,11 +159,11 @@ typedef struct __rpc_client { * struct timeval timeout; */ #define CLNT_CALL(rh, proc, xargs, argsp, xres, resp, secs) \ - ((*(rh)->cl_ops->cl_call)(rh, proc, xargs, (caddr_t)argsp, \ - xres, (caddr_t)resp, secs)) + ((*(rh)->cl_ops->cl_call)(rh, proc, xargs, \ + (caddr_t)(void *)argsp, xres, (caddr_t)(void *)resp, secs)) #define clnt_call(rh, proc, xargs, argsp, xres, resp, secs) \ - ((*(rh)->cl_ops->cl_call)(rh, proc, xargs, (caddr_t)argsp, \ - xres, (caddr_t)resp, secs)) + ((*(rh)->cl_ops->cl_call)(rh, proc, xargs, \ + (caddr_t)(void *)argsp, xres, (caddr_t)(void *)resp, secs)) /* * void diff --git a/include/rpc/svc.h b/include/rpc/svc.h index de8df7adf9ca..938c8025d8ee 100644 --- a/include/rpc/svc.h +++ b/include/rpc/svc.h @@ -1,4 +1,4 @@ -/* $NetBSD: svc.h,v 1.14 1998/07/26 11:45:21 mycroft Exp $ */ +/* $NetBSD: svc.h,v 1.15 1998/11/16 12:07:43 christos Exp $ */ /* * Sun RPC is a product of Sun Microsystems, Inc. and is provided for @@ -97,8 +97,8 @@ typedef struct __rpc_svcxprt { int xp_addrlen; /* length of remote address */ struct sockaddr_in xp_raddr; /* remote address */ struct opaque_auth xp_verf; /* raw response verifier */ - caddr_t xp_p1; /* private */ - caddr_t xp_p2; /* private */ + void *xp_p1; /* private */ + void *xp_p2; /* private */ } SVCXPRT; /* @@ -153,8 +153,8 @@ struct svc_req { u_int32_t rq_vers; /* service protocol version */ u_int32_t rq_proc; /* the desired procedure */ struct opaque_auth rq_cred; /* raw creds from the wire */ - caddr_t rq_clntcred; /* read only cooked cred */ - SVCXPRT *rq_xprt; /* associated transport */ + void *rq_clntcred; /* read only cooked cred */ + SVCXPRT *rq_xprt; /* associated transport */ }; diff --git a/include/rpc/xdr.h b/include/rpc/xdr.h index 9b11747a18de..d2052573dadc 100644 --- a/include/rpc/xdr.h +++ b/include/rpc/xdr.h @@ -1,4 +1,4 @@ -/* $NetBSD: xdr.h,v 1.14 1998/07/26 12:43:24 mycroft Exp $ */ +/* $NetBSD: xdr.h,v 1.15 1998/11/16 12:07:43 christos Exp $ */ /* * Sun RPC is a product of Sun Microsystems, Inc. and is provided for @@ -117,7 +117,7 @@ typedef struct __rpc_xdr { void (*x_destroy) __P((struct __rpc_xdr *)); } *x_ops; char * x_public; /* users' data */ - char * x_private; /* pointer to private data */ + void * x_private; /* pointer to private data */ char * x_base; /* private used for position info */ int x_handy; /* extra private word */ } XDR; @@ -202,7 +202,7 @@ struct xdr_discrim { }; /* - * In-line routines for fast encode/decode of primitve data types. + * In-line routines for fast encode/decode of primitive data types. * Caveat emptor: these use single memory cycles to get the * data from the underlying buffer, and will fail to operate * properly if the data is not aligned. The standard way to use these @@ -216,8 +216,8 @@ struct xdr_discrim { * N.B. and frozen for all time: each data type here uses 4 bytes * of external representation. */ -#define IXDR_GET_LONG(buf) ((long)ntohl((u_long)*(buf)++)) -#define IXDR_PUT_LONG(buf, v) (*(buf)++ = (long)htonl((u_long)v)) +#define IXDR_GET_LONG(buf) ((long)ntohl((u_int32_t)*(buf)++)) +#define IXDR_PUT_LONG(buf, v) (*(buf)++ =(int32_t)htonl((u_int32_t)v)) #define IXDR_GET_BOOL(buf) ((bool_t)IXDR_GET_LONG(buf)) #define IXDR_GET_ENUM(buf, t) ((t)IXDR_GET_LONG(buf)) @@ -225,11 +225,11 @@ struct xdr_discrim { #define IXDR_GET_SHORT(buf) ((short)IXDR_GET_LONG(buf)) #define IXDR_GET_U_SHORT(buf) ((u_short)IXDR_GET_LONG(buf)) -#define IXDR_PUT_BOOL(buf, v) IXDR_PUT_LONG((buf), ((long)(v))) -#define IXDR_PUT_ENUM(buf, v) IXDR_PUT_LONG((buf), ((long)(v))) -#define IXDR_PUT_U_LONG(buf, v) IXDR_PUT_LONG((buf), ((long)(v))) -#define IXDR_PUT_SHORT(buf, v) IXDR_PUT_LONG((buf), ((long)(v))) -#define IXDR_PUT_U_SHORT(buf, v) IXDR_PUT_LONG((buf), ((long)(v))) +#define IXDR_PUT_BOOL(buf, v) IXDR_PUT_LONG((buf), (v)) +#define IXDR_PUT_ENUM(buf, v) IXDR_PUT_LONG((buf), (v)) +#define IXDR_PUT_U_LONG(buf, v) IXDR_PUT_LONG((buf), (v)) +#define IXDR_PUT_SHORT(buf, v) IXDR_PUT_LONG((buf), (v)) +#define IXDR_PUT_U_SHORT(buf, v) IXDR_PUT_LONG((buf), (v)) /* * These are the "generic" xdr routines.