RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2004-11-21 Ralf Corsepius <ralf.corsepius@rtems.org>

Browse Source 
* librpc/include/rpc/types.h: Include <rtems/stdint.h>.
	* librpc/src/rpc/clnt_raw.c, librpc/src/rpc/rpcdname.c,
	librpc/src/rpc/rtems_portmapper.c, librpc/src/rpc/svc.c,
	librpc/src/rpc/svc_simple.c: Misc. cast-related fixes.
	Convert to ANSI.
This commit is contained in:
Ralf Corsepius
2004-11-21 05:33:00 +00:00
parent ddb56f497d
commit 5220ae2f71
7 changed files with 112 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cpukit/ChangeLog
View File

@@ -1,3 +1,11 @@
2004-11-21 Ralf Corsepius <ralf.corsepius@rtems.org>
* librpc/include/rpc/types.h: Include <rtems/stdint.h>.
* librpc/src/rpc/clnt_raw.c, librpc/src/rpc/rpcdname.c,
librpc/src/rpc/rtems_portmapper.c, librpc/src/rpc/svc.c,
librpc/src/rpc/svc_simple.c: Misc. cast-related fixes.
Convert to ANSI.
2004-11-21 Ralf Corsepius <ralf.corsepius@rtems.org> 2004-11-21 Ralf Corsepius <ralf.corsepius@rtems.org>
* librpc/include/rpc/rpc.h (struct _rtems_rpc_task_variables): * librpc/include/rpc/rpc.h (struct _rtems_rpc_task_variables):

2
cpukit/librpc/include/rpc/types.h
View File

@@ -37,6 +37,8 @@
#ifndef _RPC_TYPES_H #ifndef _RPC_TYPES_H
#define _RPC_TYPES_H #define _RPC_TYPES_H
#include <rtems/stdint.h>
#define bool_t int32_t #define bool_t int32_t
#define enum_t int32_t #define enum_t int32_t
#define __dontcare__ -1 #define __dontcare__ -1

30
cpukit/librpc/src/rpc/clnt_raw.c
View File

@@ -84,9 +84,9 @@ void svc_getreq();
* Create a client handle for memory based rpc. * Create a client handle for memory based rpc.
*/ */
CLIENT * CLIENT *
clntraw_create(prog, vers) clntraw_create(
u_long prog; u_long prog,
u_long vers; u_long vers )
{ {
register struct clnt_raw_private *clp = clntraw_private; register struct clnt_raw_private *clp = clntraw_private;
struct rpc_msg call_msg; struct rpc_msg call_msg;
@@ -127,14 +127,14 @@ clntraw_create(prog, vers)
} }
static enum clnt_stat static enum clnt_stat
clntraw_call(h, proc, xargs, argsp, xresults, resultsp, timeout) clntraw_call(
CLIENT *h; CLIENT *h,
u_long proc; u_long proc,
xdrproc_t xargs; xdrproc_t xargs,
caddr_t argsp; caddr_t argsp,
xdrproc_t xresults; xdrproc_t xresults,
caddr_t resultsp; caddr_t resultsp,
struct timeval timeout; struct timeval timeout )
{ {
register struct clnt_raw_private *clp = clntraw_private; register struct clnt_raw_private *clp = clntraw_private;
register XDR *xdrs = &clp->xdr_stream; register XDR *xdrs = &clp->xdr_stream;
@@ -208,10 +208,10 @@ clntraw_geterr()
static bool_t static bool_t
clntraw_freeres(cl, xdr_res, res_ptr) clntraw_freeres(
CLIENT *cl; CLIENT *cl,
xdrproc_t xdr_res; xdrproc_t xdr_res,
caddr_t res_ptr; caddr_t res_ptr )
{ {
register struct clnt_raw_private *clp = clntraw_private; register struct clnt_raw_private *clp = clntraw_private;
register XDR *xdrs = &clp->xdr_stream; register XDR *xdrs = &clp->xdr_stream;

8
cpukit/librpc/src/rpc/rpcdname.c
View File

@@ -54,8 +54,8 @@ get_default_domain()
return (default_domain); return (default_domain);
if (getdomainname(temp, sizeof(temp)) < 0) if (getdomainname(temp, sizeof(temp)) < 0)
return (0); return (0);
if ((int) strlen(temp) > 0) { if (strlen(temp) > 0) {
default_domain = (char *)malloc((strlen(temp)+(unsigned)1)); default_domain = (char *)malloc((strlen(temp)+(size_t)1));
if (default_domain == 0) if (default_domain == 0)
return (0); return (0);
(void) strcpy(default_domain, temp); (void) strcpy(default_domain, temp);
@@ -71,8 +71,8 @@ get_default_domain()
* get rejected elsewhere in the NIS client package. * get rejected elsewhere in the NIS client package.
*/ */
int int
_rpc_get_default_domain(domain) _rpc_get_default_domain(
char **domain; char **domain )
{ {
if ((*domain = get_default_domain()) != 0) if ((*domain = get_default_domain()) != 0)
return (0); return (0);

55
cpukit/librpc/src/rpc/rtems_portmapper.c
View File

@@ -77,7 +77,7 @@ static rtems_task rtems_portmapper (rtems_task_argument unused)
rtems_task_delete (RTEMS_SELF); rtems_task_delete (RTEMS_SELF);
} }
/* make an entry for ourself */ /* make an entry for ourself */
pml = (struct pmaplist *)malloc((u_int)sizeof(struct pmaplist)); pml = (struct pmaplist *)malloc(sizeof(struct pmaplist));
pml->pml_next = 0; pml->pml_next = 0;
pml->pml_map.pm_prog = PMAPPROG; pml->pml_map.pm_prog = PMAPPROG;
pml->pml_map.pm_vers = PMAPVERS; pml->pml_map.pm_vers = PMAPVERS;
@@ -102,7 +102,7 @@ static rtems_task rtems_portmapper (rtems_task_argument unused)
rtems_task_delete (RTEMS_SELF); rtems_task_delete (RTEMS_SELF);
} }
/* make an entry for ourself */ /* make an entry for ourself */
pml = (struct pmaplist *)malloc((u_int)sizeof(struct pmaplist)); pml = (struct pmaplist *)malloc(sizeof(struct pmaplist));
pml->pml_map.pm_prog = PMAPPROG; pml->pml_map.pm_prog = PMAPPROG;
pml->pml_map.pm_vers = PMAPVERS; pml->pml_map.pm_vers = PMAPVERS;
pml->pml_map.pm_prot = IPPROTO_TCP; pml->pml_map.pm_prot = IPPROTO_TCP;
@@ -119,9 +119,10 @@ static rtems_task rtems_portmapper (rtems_task_argument unused)
} }
static struct pmaplist * static struct pmaplist *
find_service(prog, vers, prot) find_service(
u_long prog; u_long prog,
u_long vers; u_long vers,
int prot )
{ {
register struct pmaplist *hit = NULL; register struct pmaplist *hit = NULL;
register struct pmaplist *pml; register struct pmaplist *pml;
@@ -140,9 +141,9 @@ for (pml = pmaplist; pml != NULL; pml = pml->pml_next) {
/* /*
* 1 OK, 0 not * 1 OK, 0 not
*/ */
static void reg_service(rqstp, xprt) static void reg_service(
struct svc_req *rqstp; struct svc_req *rqstp,
SVCXPRT *xprt; SVCXPRT *xprt )
{ {
struct pmap reg; struct pmap reg;
struct pmaplist *pml, *prevpml, *fnd; struct pmaplist *pml, *prevpml, *fnd;
@@ -190,7 +191,7 @@ static void reg_service(rqstp, xprt)
* add to END of list * add to END of list
*/ */
pml = (struct pmaplist *) pml = (struct pmaplist *)
malloc((u_int)sizeof(struct pmaplist)); malloc(sizeof(struct pmaplist));
pml->pml_map = reg; pml->pml_map = reg;
pml->pml_next = 0; pml->pml_next = 0;
if (pmaplist == 0) { if (pmaplist == 0) {
@@ -309,9 +310,9 @@ struct encap_parms {
}; };
static bool_t static bool_t
xdr_encap_parms(xdrs, epp) xdr_encap_parms(
XDR *xdrs; XDR *xdrs,
struct encap_parms *epp; struct encap_parms *epp )
{ {
return (xdr_bytes(xdrs, &(epp->args), (u_int*)&(epp->arglen), ARGSIZE)); return (xdr_bytes(xdrs, &(epp->args), (u_int*)&(epp->arglen), ARGSIZE));
@@ -326,9 +327,9 @@ struct rmtcallargs {
}; };
static bool_t static bool_t
xdr_rmtcall_args(xdrs, cap) xdr_rmtcall_args(
register XDR *xdrs; register XDR *xdrs,
register struct rmtcallargs *cap; register struct rmtcallargs *cap )
{ {
/* does not get a port number */ /* does not get a port number */
@@ -341,9 +342,9 @@ xdr_rmtcall_args(xdrs, cap)
} }
static bool_t static bool_t
xdr_rmtcall_result(xdrs, cap) xdr_rmtcall_result(
register XDR *xdrs; register XDR *xdrs,
register struct rmtcallargs *cap; register struct rmtcallargs *cap )
{ {
if (xdr_u_long(xdrs, &(cap->rmt_port))) if (xdr_u_long(xdrs, &(cap->rmt_port)))
return (xdr_encap_parms(xdrs, &(cap->rmt_args))); return (xdr_encap_parms(xdrs, &(cap->rmt_args)));
@@ -355,9 +356,9 @@ xdr_rmtcall_result(xdrs, cap)
* The arglen must already be set!! * The arglen must already be set!!
*/ */
static bool_t static bool_t
xdr_opaque_parms(xdrs, cap) xdr_opaque_parms(
XDR *xdrs; XDR *xdrs,
struct rmtcallargs *cap; struct rmtcallargs *cap )
{ {
return (xdr_opaque(xdrs, cap->rmt_args.args, cap->rmt_args.arglen)); return (xdr_opaque(xdrs, cap->rmt_args.args, cap->rmt_args.arglen));
@@ -368,9 +369,9 @@ xdr_opaque_parms(xdrs, cap)
* and then calls xdr_opaque_parms. * and then calls xdr_opaque_parms.
*/ */
static bool_t static bool_t
xdr_len_opaque_parms(xdrs, cap) xdr_len_opaque_parms(
register XDR *xdrs; register XDR *xdrs,
struct rmtcallargs *cap; struct rmtcallargs *cap )
{ {
register u_int beginpos, lowpos, highpos, currpos, pos; register u_int beginpos, lowpos, highpos, currpos, pos;
@@ -401,9 +402,9 @@ xdr_len_opaque_parms(xdrs, cap)
* back to the portmapper. * back to the portmapper.
*/ */
static void static void
callit(rqstp, xprt) callit(
struct svc_req *rqstp; struct svc_req *rqstp,
SVCXPRT *xprt; SVCXPRT *xprt )
{ {
struct rmtcallargs a; struct rmtcallargs a;
struct pmaplist *pml; struct pmaplist *pml;

90
cpukit/librpc/src/rpc/svc.c
View File

@@ -79,8 +79,8 @@ static struct svc_callout *svc_find();
* Activate a transport handle. * Activate a transport handle.
*/ */
void void
xprt_register(xprt) xprt_register(
SVCXPRT *xprt; SVCXPRT *xprt )
{ {
register int sock = xprt->xp_sock; register int sock = xprt->xp_sock;
@@ -125,8 +125,8 @@ xprt_register(xprt)
* De-activate a transport handle. * De-activate a transport handle.
*/ */
void void
xprt_unregister(xprt) xprt_unregister(
SVCXPRT *xprt; SVCXPRT *xprt )
{ {
register int sock = xprt->xp_sock; register int sock = xprt->xp_sock;
@@ -156,12 +156,12 @@ xprt_unregister(xprt)
* program number comes in. * program number comes in.
*/ */
bool_t bool_t
svc_register(xprt, prog, vers, dispatch, protocol) svc_register(
SVCXPRT *xprt; SVCXPRT *xprt,
u_long prog; u_long prog,
u_long vers; u_long vers,
void (*dispatch)(); void (*dispatch)(),
int protocol; int protocol )
{ {
struct svc_callout *prev; struct svc_callout *prev;
register struct svc_callout *s; register struct svc_callout *s;
@@ -192,9 +192,9 @@ pmap_it:
* Remove a service program from the callout list. * Remove a service program from the callout list.
*/ */
void void
svc_unregister(prog, vers) svc_unregister(
u_long prog; u_long prog,
u_long vers; u_long vers )
{ {
struct svc_callout *prev; struct svc_callout *prev;
register struct svc_callout *s; register struct svc_callout *s;
@@ -217,10 +217,10 @@ svc_unregister(prog, vers)
* struct. * struct.
*/ */
static struct svc_callout * static struct svc_callout *
svc_find(prog, vers, prev) svc_find(
u_long prog; u_long prog,
u_long vers; u_long vers,
struct svc_callout **prev; struct svc_callout **prev )
{ {
register struct svc_callout *s, *p; register struct svc_callout *s, *p;
@@ -241,10 +241,10 @@ done:
* Send a reply to an rpc request * Send a reply to an rpc request
*/ */
bool_t bool_t
svc_sendreply(xprt, xdr_results, xdr_location) svc_sendreply(
register SVCXPRT *xprt; register SVCXPRT *xprt,
xdrproc_t xdr_results; xdrproc_t xdr_results,
caddr_t xdr_location; caddr_t xdr_location )
{ {
struct rpc_msg rply; struct rpc_msg rply;
@@ -261,8 +261,8 @@ svc_sendreply(xprt, xdr_results, xdr_location)
* No procedure error reply * No procedure error reply
*/ */
void void
svcerr_noproc(xprt) svcerr_noproc(
register SVCXPRT *xprt; register SVCXPRT *xprt )
{ {
struct rpc_msg rply; struct rpc_msg rply;
@@ -277,8 +277,8 @@ svcerr_noproc(xprt)
* Can't decode args error reply * Can't decode args error reply
*/ */
void void
svcerr_decode(xprt) svcerr_decode(
register SVCXPRT *xprt; register SVCXPRT *xprt )
{ {
struct rpc_msg rply; struct rpc_msg rply;
@@ -293,8 +293,8 @@ svcerr_decode(xprt)
* Some system error * Some system error
*/ */
void void
svcerr_systemerr(xprt) svcerr_systemerr(
register SVCXPRT *xprt; register SVCXPRT *xprt )
{ {
struct rpc_msg rply; struct rpc_msg rply;
@@ -309,9 +309,9 @@ svcerr_systemerr(xprt)
* Authentication error reply * Authentication error reply
*/ */
void void
svcerr_auth(xprt, why) svcerr_auth(
SVCXPRT *xprt; SVCXPRT *xprt,
enum auth_stat why; enum auth_stat why )
{ {
struct rpc_msg rply; struct rpc_msg rply;
@@ -326,8 +326,8 @@ svcerr_auth(xprt, why)
* Auth too weak error reply * Auth too weak error reply
*/ */
void void
svcerr_weakauth(xprt) svcerr_weakauth(
SVCXPRT *xprt; SVCXPRT *xprt )
{ {
svcerr_auth(xprt, AUTH_TOOWEAK); svcerr_auth(xprt, AUTH_TOOWEAK);
@@ -337,8 +337,8 @@ svcerr_weakauth(xprt)
* Program unavailable error reply * Program unavailable error reply
*/ */
void void
svcerr_noprog(xprt) svcerr_noprog(
register SVCXPRT *xprt; register SVCXPRT *xprt )
{ {
struct rpc_msg rply; struct rpc_msg rply;
@@ -353,10 +353,10 @@ svcerr_noprog(xprt)
* Program version mismatch error reply * Program version mismatch error reply
*/ */
void void
svcerr_progvers(xprt, low_vers, high_vers) svcerr_progvers(
register SVCXPRT *xprt; register SVCXPRT *xprt,
u_long low_vers; u_long low_vers,
u_long high_vers; u_long high_vers )
{ {
struct rpc_msg rply; struct rpc_msg rply;
@@ -388,8 +388,8 @@ svcerr_progvers(xprt, low_vers, high_vers)
*/ */
void void
svc_getreq(rdfds) svc_getreq(
int rdfds; int rdfds )
{ {
fd_set readfds; fd_set readfds;
@@ -399,16 +399,16 @@ svc_getreq(rdfds)
} }
void void
svc_getreqset(readfds) svc_getreqset(
fd_set *readfds; fd_set *readfds )
{ {
svc_getreqset2(readfds, FD_SETSIZE); svc_getreqset2(readfds, FD_SETSIZE);
} }
void void
svc_getreqset2(readfds, width) svc_getreqset2(
fd_set *readfds; fd_set *readfds,
int width; int width )
{ {
enum xprt_stat stat; enum xprt_stat stat;
struct rpc_msg msg; struct rpc_msg msg;

17
cpukit/librpc/src/rpc/svc_simple.c
View File

@@ -61,10 +61,13 @@ static void universal();
#define transp (rtems_rpc_task_variables->svc_simple_transp) #define transp (rtems_rpc_task_variables->svc_simple_transp)
int int
registerrpc(prognum, versnum, procnum, progname, inproc, outproc) registerrpc(
int prognum, versnum, procnum; int prognum,
char *(*progname)(); int versnum,
xdrproc_t inproc, outproc; int procnum,
char *(*progname)(),
xdrproc_t inproc,
xdrproc_t outproc )
{ {
if (procnum == NULLPROC) { if (procnum == NULLPROC) {
@@ -102,9 +105,9 @@ registerrpc(prognum, versnum, procnum, progname, inproc, outproc)
} }
static void static void
universal(rqstp, atransp) universal(
struct svc_req *rqstp; struct svc_req *rqstp,
SVCXPRT *atransp; SVCXPRT *atransp )
{ {
int prog, proc; int prog, proc;
char *outdata; char *outdata;