summaryrefslogtreecommitdiffstats
path: root/cpukit/librpc
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2004-11-21 04:45:39 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2004-11-21 04:45:39 +0000
commitddb56f497d21aa84cf3311ac665744243cd627a0 (patch)
tree014ac737c0c11e17c9012d08b49a20c831023166 /cpukit/librpc
parent56c4caeca69e71a42370d1171428a9091bdb6e77 (diff)
downloadrtems-ddb56f497d21aa84cf3311ac665744243cd627a0.tar.bz2
2004-11-21 Ralf Corsepius <ralf.corsepius@rtems.org>
* librpc/include/rpc/rpc.h (struct _rtems_rpc_task_variables): Use pointers to types instead of void* to avoid casts. * librpc/src/rpc/clnt_perror.c, librpc/src/rpc/clnt_raw.c, librpc/src/rpc/clnt_simple.c, librpc/src/rpc/rpcdname.c, librpc/src/rpc/svc.c, librpc/src/rpc/svc_auth.c, librpc/src/rpc/svc_simple.c: Eliminate lvalue casts gcc-3.4 warns about.
Diffstat (limited to 'cpukit/librpc')
-rw-r--r--cpukit/librpc/include/rpc/rpc.h26
-rw-r--r--cpukit/librpc/src/rpc/clnt_perror.c2
-rw-r--r--cpukit/librpc/src/rpc/clnt_raw.c2
-rw-r--r--cpukit/librpc/src/rpc/clnt_simple.c2
-rw-r--r--cpukit/librpc/src/rpc/rpcdname.c2
-rw-r--r--cpukit/librpc/src/rpc/svc.c4
-rw-r--r--cpukit/librpc/src/rpc/svc_auth.c2
-rw-r--r--cpukit/librpc/src/rpc/svc_simple.c6
8 files changed, 23 insertions, 23 deletions
diff --git a/cpukit/librpc/include/rpc/rpc.h b/cpukit/librpc/include/rpc/rpc.h
index 74b97e6b1d..5be4d2a9c9 100644
--- a/cpukit/librpc/include/rpc/rpc.h
+++ b/cpukit/librpc/include/rpc/rpc.h
@@ -103,34 +103,34 @@ int rtems_rpc_start_portmapper (int priority);
struct _rtems_rpc_task_variables {
int svc_svc_maxfd;
fd_set svc_svc_fdset;
- void *svc_xports;
+ SVCXPRT ** svc_xports;
int svc_xportssize;
int svc__svc_fdsetsize;
- void *svc__svc_fdset;
- void *svc_svc_head;
+ fd_set *svc__svc_fdset;
+ struct svc_callout *svc_svc_head;
- void *clnt_perror_buf;
+ char *clnt_perror_buf;
- void *clnt_raw_private;
+ struct clnt_raw_private *clnt_raw_private;
void *call_rpc_private;
- void *svc_raw_private;
+ struct call_rpc_private *svc_raw_private;
- void *svc_simple_proglst;
- void *svc_simple_pl;
- void *svc_simple_transp;
+ struct prog_lst *svc_simple_proglst;
+ struct prog_lst *svc_simple_pl;
+ SVCXPRT *svc_simple_transp;
- void *rpcdname_default_domain;
+ char *rpcdname_default_domain;
- void *svc_auths_Auths;
+ struct authsvc *svc_auths_Auths;
};
extern struct _rtems_rpc_task_variables *rtems_rpc_task_variables;
#define svc_maxfd (rtems_rpc_task_variables->svc_svc_maxfd)
-#define svc_fdset ((rtems_rpc_task_variables)->svc_svc_fdset)
+#define svc_fdset (rtems_rpc_task_variables->svc_svc_fdset)
#define __svc_fdsetsize (rtems_rpc_task_variables->svc__svc_fdsetsize)
-#define __svc_fdset (fd_set *)(rtems_rpc_task_variables->svc__svc_fdset)
+#define __svc_fdset (rtems_rpc_task_variables->svc__svc_fdset)
#endif /* _RTEMS_RPC_INTERNAL_ */
diff --git a/cpukit/librpc/src/rpc/clnt_perror.c b/cpukit/librpc/src/rpc/clnt_perror.c
index a7df29c0dd..d38761d6d5 100644
--- a/cpukit/librpc/src/rpc/clnt_perror.c
+++ b/cpukit/librpc/src/rpc/clnt_perror.c
@@ -50,7 +50,7 @@ static char *rcsid = "$FreeBSD: src/lib/libc/rpc/clnt_perror.c,v 1.11 1999/08/28
static char *auth_errmsg();
#define CLNT_PERROR_BUFLEN 256
-#define buf ((char *)(rtems_rpc_task_variables)->clnt_perror_buf)
+#define buf (rtems_rpc_task_variables->clnt_perror_buf)
static char *
_buf()
diff --git a/cpukit/librpc/src/rpc/clnt_raw.c b/cpukit/librpc/src/rpc/clnt_raw.c
index d17221a997..300a14cf8d 100644
--- a/cpukit/librpc/src/rpc/clnt_raw.c
+++ b/cpukit/librpc/src/rpc/clnt_raw.c
@@ -60,7 +60,7 @@ struct clnt_raw_private {
char mashl_callmsg[MCALL_MSG_SIZE];
u_int mcnt;
};
-#define clntraw_private ((struct clnt_raw_private *) (rtems_rpc_task_variables)->clnt_raw_private)
+#define clntraw_private (rtems_rpc_task_variables->clnt_raw_private)
static enum clnt_stat clntraw_call();
static void clntraw_abort();
diff --git a/cpukit/librpc/src/rpc/clnt_simple.c b/cpukit/librpc/src/rpc/clnt_simple.c
index b6b90c51c5..3a772203d3 100644
--- a/cpukit/librpc/src/rpc/clnt_simple.c
+++ b/cpukit/librpc/src/rpc/clnt_simple.c
@@ -55,7 +55,7 @@ struct call_rpc_private {
int oldprognum, oldversnum, valid;
char *oldhost;
};
-#define callrpc_private ((struct call_rpc_private *)(rtems_rpc_task_variables)->call_rpc_private)
+#define callrpc_private (rtems_rpc_task_variables->call_rpc_private)
int
callrpc(host, prognum, versnum, procnum, inproc, in, outproc, out)
diff --git a/cpukit/librpc/src/rpc/rpcdname.c b/cpukit/librpc/src/rpc/rpcdname.c
index f31ded00c7..be7e634872 100644
--- a/cpukit/librpc/src/rpc/rpcdname.c
+++ b/cpukit/librpc/src/rpc/rpcdname.c
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)rpcdname.c 1.7 91/03/11 Copyr 1989 Sun Micro";
int getdomainname(char *, size_t);
-#define default_domain ((char *)(rtems_rpc_task_variables)->rpcdname_default_domain)
+#define default_domain (rtems_rpc_task_variables->rpcdname_default_domain)
static char *
get_default_domain()
diff --git a/cpukit/librpc/src/rpc/svc.c b/cpukit/librpc/src/rpc/svc.c
index 751ca3185f..0d9aac82cf 100644
--- a/cpukit/librpc/src/rpc/svc.c
+++ b/cpukit/librpc/src/rpc/svc.c
@@ -49,7 +49,7 @@ static char *rcsid = "$FreeBSD: src/lib/libc/rpc/svc.c,v 1.14 1999/08/28 00:00:4
#include <rpc/rpc.h>
#include <rpc/pmap_clnt.h>
-#define xports ((SVCXPRT **) rtems_rpc_task_variables->svc_xports)
+#define xports (rtems_rpc_task_variables->svc_xports)
#define xportssize (rtems_rpc_task_variables->svc_xportssize)
#define NULL_SVC ((struct svc_callout *)0)
@@ -69,7 +69,7 @@ struct svc_callout {
u_long sc_vers;
void (*sc_dispatch)();
};
-#define svc_head (struct svc_callout *)((rtems_rpc_task_variables)->svc_svc_head)
+#define svc_head (rtems_rpc_task_variables->svc_svc_head)
static struct svc_callout *svc_find();
diff --git a/cpukit/librpc/src/rpc/svc_auth.c b/cpukit/librpc/src/rpc/svc_auth.c
index 5f36433388..c1095932a7 100644
--- a/cpukit/librpc/src/rpc/svc_auth.c
+++ b/cpukit/librpc/src/rpc/svc_auth.c
@@ -87,7 +87,7 @@ struct authsvc {
enum auth_stat (*handler)();
struct authsvc *next;
};
-#define Auths ((struct authsvc *)(rtems_rpc_task_variables)->svc_auths_Auths)
+#define Auths (rtems_rpc_task_variables->svc_auths_Auths)
/*
* The call rpc message, msg has been obtained from the wire. The msg contains
diff --git a/cpukit/librpc/src/rpc/svc_simple.c b/cpukit/librpc/src/rpc/svc_simple.c
index c22063ffc6..300ec93085 100644
--- a/cpukit/librpc/src/rpc/svc_simple.c
+++ b/cpukit/librpc/src/rpc/svc_simple.c
@@ -56,9 +56,9 @@ struct prog_lst {
struct prog_lst *p_nxt;
};
static void universal();
-#define proglst ((struct prog_lst *)(rtems_rpc_task_variables)->svc_simple_proglst)
-#define pl ((struct prog_lst *)(rtems_rpc_task_variables)->svc_simple_pl)
-#define transp ((SVCXPRT *)(rtems_rpc_task_variables)->svc_simple_transp)
+#define proglst (rtems_rpc_task_variables->svc_simple_proglst)
+#define pl (rtems_rpc_task_variables->svc_simple_pl)
+#define transp (rtems_rpc_task_variables->svc_simple_transp)
int
registerrpc(prognum, versnum, procnum, progname, inproc, outproc)