From c1fe19d4c1db610692365472a90f4661e48449c1 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Mon, 9 Oct 2000 20:06:30 +0000 Subject: Bug ugly formatting update --- libc/inet/rpc/xdr_rec.c | 312 ++++++++++++++++++++++++------------------------ 1 file changed, 153 insertions(+), 159 deletions(-) (limited to 'libc/inet/rpc/xdr_rec.c') diff --git a/libc/inet/rpc/xdr_rec.c b/libc/inet/rpc/xdr_rec.c index 4d0d4ecfb..94fcc3809 100644 --- a/libc/inet/rpc/xdr_rec.c +++ b/libc/inet/rpc/xdr_rec.c @@ -53,20 +53,20 @@ static char sccsid[] = "@(#)xdr_rec.c 1.21 87/08/11 Copyr 1984 Sun Micro"; #include #include -extern long lseek(); +extern long lseek(); -static u_int fix_buf_size(); +static u_int fix_buf_size(); -static bool_t xdrrec_getlong(); -static bool_t xdrrec_putlong(); -static bool_t xdrrec_getbytes(); -static bool_t xdrrec_putbytes(); -static u_int xdrrec_getpos(); -static bool_t xdrrec_setpos(); -static long * xdrrec_inline(); -static void xdrrec_destroy(); +static bool_t xdrrec_getlong(); +static bool_t xdrrec_putlong(); +static bool_t xdrrec_getbytes(); +static bool_t xdrrec_putbytes(); +static u_int xdrrec_getpos(); +static bool_t xdrrec_setpos(); +static long *xdrrec_inline(); +static void xdrrec_destroy(); -static struct xdr_ops xdrrec_ops = { +static struct xdr_ops xdrrec_ops = { xdrrec_getlong, xdrrec_putlong, xdrrec_getbytes, @@ -98,21 +98,21 @@ typedef struct rec_strm { /* * out-goung bits */ - int (*writeit)(); - caddr_t out_base; /* output buffer (points to frag header) */ - caddr_t out_finger; /* next output position */ - caddr_t out_boundry; /* data cannot up to this address */ - u_long *frag_header; /* beginning of curren fragment */ - bool_t frag_sent; /* true if buffer sent in middle of record */ + int (*writeit) (); + caddr_t out_base; /* output buffer (points to frag header) */ + caddr_t out_finger; /* next output position */ + caddr_t out_boundry; /* data cannot up to this address */ + u_long *frag_header; /* beginning of curren fragment */ + bool_t frag_sent; /* true if buffer sent in middle of record */ /* * in-coming bits */ - int (*readit)(); - u_long in_size; /* fixed size of the input buffer */ + int (*readit) (); + u_long in_size; /* fixed size of the input buffer */ caddr_t in_base; - caddr_t in_finger; /* location of next byte to be had */ - caddr_t in_boundry; /* can read up to this location */ - long fbtbc; /* fragment bytes to be consumed */ + caddr_t in_finger; /* location of next byte to be had */ + caddr_t in_boundry; /* can read up to this location */ + long fbtbc; /* fragment bytes to be consumed */ bool_t last_frag; u_int sendsize; u_int recvsize; @@ -128,20 +128,18 @@ typedef struct rec_strm { * write respectively. They are like the system * calls expect that they take an opaque handle rather than an fd. */ -void -xdrrec_create(xdrs, sendsize, recvsize, tcp_handle, readit, writeit) - register XDR *xdrs; - register u_int sendsize; - register u_int recvsize; - caddr_t tcp_handle; - int (*readit)(); /* like read, but pass it a tcp_handle, not sock */ - int (*writeit)(); /* like write, but pass it a tcp_handle, not sock */ +void xdrrec_create(xdrs, sendsize, recvsize, tcp_handle, readit, writeit) +register XDR *xdrs; +register u_int sendsize; +register u_int recvsize; +caddr_t tcp_handle; +int (*readit) (); /* like read, but pass it a tcp_handle, not sock */ +int (*writeit) (); /* like write, but pass it a tcp_handle, not sock */ { - register RECSTREAM *rstrm = - (RECSTREAM *)mem_alloc(sizeof(RECSTREAM)); + register RECSTREAM *rstrm = (RECSTREAM *) mem_alloc(sizeof(RECSTREAM)); if (rstrm == NULL) { - (void)fprintf(stderr, "xdrrec_create: out of memory\n"); + (void) fprintf(stderr, "xdrrec_create: out of memory\n"); /* * This is bad. Should rework xdrrec_create to * return a handle, and in this case return NULL @@ -153,25 +151,26 @@ xdrrec_create(xdrs, sendsize, recvsize, tcp_handle, readit, writeit) */ rstrm->sendsize = sendsize = fix_buf_size(sendsize); rstrm->recvsize = recvsize = fix_buf_size(recvsize); - rstrm->the_buffer = mem_alloc(sendsize + recvsize + BYTES_PER_XDR_UNIT); + rstrm->the_buffer = + mem_alloc(sendsize + recvsize + BYTES_PER_XDR_UNIT); if (rstrm->the_buffer == NULL) { - (void)fprintf(stderr, "xdrrec_create: out of memory\n"); + (void) fprintf(stderr, "xdrrec_create: out of memory\n"); return; } for (rstrm->out_base = rstrm->the_buffer; - (u_int)rstrm->out_base % BYTES_PER_XDR_UNIT != 0; - rstrm->out_base++); + (u_int) rstrm->out_base % BYTES_PER_XDR_UNIT != 0; + rstrm->out_base++); rstrm->in_base = rstrm->out_base + sendsize; /* * now the rest ... */ xdrs->x_ops = &xdrrec_ops; - xdrs->x_private = (caddr_t)rstrm; + xdrs->x_private = (caddr_t) rstrm; rstrm->tcp_handle = tcp_handle; rstrm->readit = readit; rstrm->writeit = writeit; rstrm->out_finger = rstrm->out_boundry = rstrm->out_base; - rstrm->frag_header = (u_long *)rstrm->out_base; + rstrm->frag_header = (u_long *) rstrm->out_base; rstrm->out_finger += sizeof(u_long); rstrm->out_boundry += sendsize; rstrm->frag_sent = FALSE; @@ -188,36 +187,35 @@ xdrrec_create(xdrs, sendsize, recvsize, tcp_handle, readit, writeit) * xdr handle filled in by xdrrec_create. */ -static bool_t -xdrrec_getlong(xdrs, lp) - XDR *xdrs; - long *lp; +static bool_t xdrrec_getlong(xdrs, lp) +XDR *xdrs; +long *lp; { - register RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private); - register long *buflp = (long *)(rstrm->in_finger); + register RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private); + register long *buflp = (long *) (rstrm->in_finger); long mylong; /* first try the inline, fast case */ if ((rstrm->fbtbc >= sizeof(long)) && - (((int)rstrm->in_boundry - (int)buflp) >= sizeof(long))) { - *lp = (long)ntohl((u_long)(*buflp)); + (((int) rstrm->in_boundry - (int) buflp) >= sizeof(long))) { + *lp = (long) ntohl((u_long) (*buflp)); rstrm->fbtbc -= sizeof(long); rstrm->in_finger += sizeof(long); } else { - if (! xdrrec_getbytes(xdrs, (caddr_t)&mylong, sizeof(long))) + if (!xdrrec_getbytes(xdrs, (caddr_t) & mylong, sizeof(long))) return (FALSE); - *lp = (long)ntohl((u_long)mylong); + + *lp = (long) ntohl((u_long) mylong); } return (TRUE); } -static bool_t -xdrrec_putlong(xdrs, lp) - XDR *xdrs; - long *lp; +static bool_t xdrrec_putlong(xdrs, lp) +XDR *xdrs; +long *lp; { - register RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private); - register long *dest_lp = ((long *)(rstrm->out_finger)); + register RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private); + register long *dest_lp = ((long *) (rstrm->out_finger)); if ((rstrm->out_finger += sizeof(long)) > rstrm->out_boundry) { /* @@ -225,23 +223,25 @@ xdrrec_putlong(xdrs, lp) * inefficient */ rstrm->out_finger -= sizeof(long); + rstrm->frag_sent = TRUE; - if (! flush_out(rstrm, FALSE)) + if (!flush_out(rstrm, FALSE)) return (FALSE); - dest_lp = ((long *)(rstrm->out_finger)); + dest_lp = ((long *) (rstrm->out_finger)); rstrm->out_finger += sizeof(long); } - *dest_lp = (long)htonl((u_long)(*lp)); + *dest_lp = (long) htonl((u_long) (*lp)); return (TRUE); } -static bool_t /* must manage buffers, fragments, and records */ +static bool_t +/* must manage buffers, fragments, and records */ xdrrec_getbytes(xdrs, addr, len) - XDR *xdrs; - register caddr_t addr; - register u_int len; +XDR *xdrs; +register caddr_t addr; +register u_int len; { - register RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private); + register RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private); register int current; while (len > 0) { @@ -249,31 +249,30 @@ xdrrec_getbytes(xdrs, addr, len) if (current == 0) { if (rstrm->last_frag) return (FALSE); - if (! set_input_fragment(rstrm)) + if (!set_input_fragment(rstrm)) return (FALSE); continue; } current = (len < current) ? len : current; - if (! get_input_bytes(rstrm, addr, current)) + if (!get_input_bytes(rstrm, addr, current)) return (FALSE); - addr += current; + addr += current; rstrm->fbtbc -= current; len -= current; } return (TRUE); } -static bool_t -xdrrec_putbytes(xdrs, addr, len) - XDR *xdrs; - register caddr_t addr; - register u_int len; +static bool_t xdrrec_putbytes(xdrs, addr, len) +XDR *xdrs; +register caddr_t addr; +register u_int len; { - register RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private); + register RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private); register int current; while (len > 0) { - current = (u_int)rstrm->out_boundry - (u_int)rstrm->out_finger; + current = (u_int) rstrm->out_boundry - (u_int) rstrm->out_finger; current = (len < current) ? len : current; bcopy(addr, rstrm->out_finger, current); rstrm->out_finger += current; @@ -281,21 +280,20 @@ xdrrec_putbytes(xdrs, addr, len) len -= current; if (rstrm->out_finger == rstrm->out_boundry) { rstrm->frag_sent = TRUE; - if (! flush_out(rstrm, FALSE)) + if (!flush_out(rstrm, FALSE)) return (FALSE); } } return (TRUE); } -static u_int -xdrrec_getpos(xdrs) - register XDR *xdrs; +static u_int xdrrec_getpos(xdrs) +register XDR *xdrs; { - register RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private; + register RECSTREAM *rstrm = (RECSTREAM *) xdrs->x_private; register long pos; - pos = lseek((int)rstrm->tcp_handle, (long) 0, 1); + pos = lseek((int) rstrm->tcp_handle, (long) 0, 1); if (pos != -1) switch (xdrs->x_op) { @@ -308,28 +306,27 @@ xdrrec_getpos(xdrs) break; default: - pos = (u_int) -1; + pos = (u_int) - 1; break; } return ((u_int) pos); } -static bool_t -xdrrec_setpos(xdrs, pos) - register XDR *xdrs; - u_int pos; +static bool_t xdrrec_setpos(xdrs, pos) +register XDR *xdrs; +u_int pos; { - register RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private; + register RECSTREAM *rstrm = (RECSTREAM *) xdrs->x_private; u_int currpos = xdrrec_getpos(xdrs); int delta = currpos - pos; caddr_t newpos; - if ((int)currpos != -1) + if ((int) currpos != -1) switch (xdrs->x_op) { case XDR_ENCODE: newpos = rstrm->out_finger - delta; - if ((newpos > (caddr_t)(rstrm->frag_header)) && + if ((newpos > (caddr_t) (rstrm->frag_header)) && (newpos < rstrm->out_boundry)) { rstrm->out_finger = newpos; return (TRUE); @@ -338,7 +335,7 @@ xdrrec_setpos(xdrs, pos) case XDR_DECODE: newpos = rstrm->in_finger - delta; - if ((delta < (int)(rstrm->fbtbc)) && + if ((delta < (int) (rstrm->fbtbc)) && (newpos <= rstrm->in_boundry) && (newpos >= rstrm->in_base)) { rstrm->in_finger = newpos; @@ -350,13 +347,12 @@ xdrrec_setpos(xdrs, pos) return (FALSE); } -static long * -xdrrec_inline(xdrs, len) - register XDR *xdrs; - int len; +static long *xdrrec_inline(xdrs, len) +register XDR *xdrs; +int len; { - register RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private; - long * buf = NULL; + register RECSTREAM *rstrm = (RECSTREAM *) xdrs->x_private; + long *buf = NULL; switch (xdrs->x_op) { @@ -379,15 +375,14 @@ xdrrec_inline(xdrs, len) return (buf); } -static void -xdrrec_destroy(xdrs) - register XDR *xdrs; +static void xdrrec_destroy(xdrs) +register XDR *xdrs; { - register RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private; + register RECSTREAM *rstrm = (RECSTREAM *) xdrs->x_private; mem_free(rstrm->the_buffer, - rstrm->sendsize + rstrm->recvsize + BYTES_PER_XDR_UNIT); - mem_free((caddr_t)rstrm, sizeof(RECSTREAM)); + rstrm->sendsize + rstrm->recvsize + BYTES_PER_XDR_UNIT); + mem_free((caddr_t) rstrm, sizeof(RECSTREAM)); } @@ -399,17 +394,16 @@ xdrrec_destroy(xdrs) * Before reading (deserializing from the stream, one should always call * this procedure to guarantee proper record alignment. */ -bool_t -xdrrec_skiprecord(xdrs) - XDR *xdrs; +bool_t xdrrec_skiprecord(xdrs) +XDR *xdrs; { - register RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private); + register RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private); - while (rstrm->fbtbc > 0 || (! rstrm->last_frag)) { - if (! skip_input_bytes(rstrm, rstrm->fbtbc)) + while (rstrm->fbtbc > 0 || (!rstrm->last_frag)) { + if (!skip_input_bytes(rstrm, rstrm->fbtbc)) return (FALSE); rstrm->fbtbc = 0; - if ((! rstrm->last_frag) && (! set_input_fragment(rstrm))) + if ((!rstrm->last_frag) && (!set_input_fragment(rstrm))) return (FALSE); } rstrm->last_frag = FALSE; @@ -421,17 +415,16 @@ xdrrec_skiprecord(xdrs) * Returns TRUE iff there is no more input in the buffer * after consuming the rest of the current record. */ -bool_t -xdrrec_eof(xdrs) - XDR *xdrs; +bool_t xdrrec_eof(xdrs) +XDR *xdrs; { - register RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private); + register RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private); - while (rstrm->fbtbc > 0 || (! rstrm->last_frag)) { - if (! skip_input_bytes(rstrm, rstrm->fbtbc)) + while (rstrm->fbtbc > 0 || (!rstrm->last_frag)) { + if (!skip_input_bytes(rstrm, rstrm->fbtbc)) return (TRUE); rstrm->fbtbc = 0; - if ((! rstrm->last_frag) && (! set_input_fragment(rstrm))) + if ((!rstrm->last_frag) && (!set_input_fragment(rstrm))) return (TRUE); } if (rstrm->in_finger == rstrm->in_boundry) @@ -445,24 +438,23 @@ xdrrec_eof(xdrs) * (output) tcp stream. (This let's the package support batched or * pipelined procedure calls.) TRUE => immmediate flush to tcp connection. */ -bool_t -xdrrec_endofrecord(xdrs, sendnow) - XDR *xdrs; - bool_t sendnow; +bool_t xdrrec_endofrecord(xdrs, sendnow) +XDR *xdrs; +bool_t sendnow; { - register RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private); - register u_long len; /* fragment length */ + register RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private); + register u_long len; /* fragment length */ if (sendnow || rstrm->frag_sent || - ((u_long)rstrm->out_finger + sizeof(u_long) >= - (u_long)rstrm->out_boundry)) { + ((u_long) rstrm->out_finger + sizeof(u_long) >= + (u_long) rstrm->out_boundry)) { rstrm->frag_sent = FALSE; return (flush_out(rstrm, TRUE)); } - len = (u_long)(rstrm->out_finger) - (u_long)(rstrm->frag_header) - - sizeof(u_long); - *(rstrm->frag_header) = htonl((u_long)len | LAST_FRAG); - rstrm->frag_header = (u_long *)rstrm->out_finger; + len = (u_long) (rstrm->out_finger) - (u_long) (rstrm->frag_header) - + sizeof(u_long); + *(rstrm->frag_header) = htonl((u_long) len | LAST_FRAG); + rstrm->frag_header = (u_long *) rstrm->out_finger; rstrm->out_finger += sizeof(u_long); return (TRUE); } @@ -471,38 +463,38 @@ xdrrec_endofrecord(xdrs, sendnow) /* * Internal useful routines */ -static bool_t -flush_out(rstrm, eor) - register RECSTREAM *rstrm; - bool_t eor; +static bool_t flush_out(rstrm, eor) +register RECSTREAM *rstrm; +bool_t eor; { register u_long eormask = (eor == TRUE) ? LAST_FRAG : 0; - register u_long len = (u_long)(rstrm->out_finger) - - (u_long)(rstrm->frag_header) - sizeof(u_long); + register u_long len = (u_long) (rstrm->out_finger) - + (u_long) (rstrm->frag_header) - sizeof(u_long); *(rstrm->frag_header) = htonl(len | eormask); - len = (u_long)(rstrm->out_finger) - (u_long)(rstrm->out_base); - if ((*(rstrm->writeit))(rstrm->tcp_handle, rstrm->out_base, (int)len) - != (int)len) + len = (u_long) (rstrm->out_finger) - (u_long) (rstrm->out_base); + if ((*(rstrm->writeit)) (rstrm->tcp_handle, rstrm->out_base, (int) len) + != (int) len) return (FALSE); - rstrm->frag_header = (u_long *)rstrm->out_base; - rstrm->out_finger = (caddr_t)rstrm->out_base + sizeof(u_long); + rstrm->frag_header = (u_long *) rstrm->out_base; + rstrm->out_finger = (caddr_t) rstrm->out_base + sizeof(u_long); return (TRUE); } -static bool_t /* knows nothing about records! Only about input buffers */ +static bool_t +/* knows nothing about records! Only about input buffers */ fill_input_buf(rstrm) - register RECSTREAM *rstrm; +register RECSTREAM *rstrm; { register caddr_t where; u_int i; register int len; where = rstrm->in_base; - i = (u_int)rstrm->in_boundry % BYTES_PER_XDR_UNIT; + i = (u_int) rstrm->in_boundry % BYTES_PER_XDR_UNIT; where += i; len = rstrm->in_size - i; - if ((len = (*(rstrm->readit))(rstrm->tcp_handle, where, len)) == -1) + if ((len = (*(rstrm->readit)) (rstrm->tcp_handle, where, len)) == -1) return (FALSE); rstrm->in_finger = where; where += len; @@ -510,18 +502,19 @@ fill_input_buf(rstrm) return (TRUE); } -static bool_t /* knows nothing about records! Only about input buffers */ +static bool_t +/* knows nothing about records! Only about input buffers */ get_input_bytes(rstrm, addr, len) - register RECSTREAM *rstrm; - register caddr_t addr; - register int len; +register RECSTREAM *rstrm; +register caddr_t addr; +register int len; { register int current; while (len > 0) { - current = (int)rstrm->in_boundry - (int)rstrm->in_finger; + current = (int) rstrm->in_boundry - (int) rstrm->in_finger; if (current == 0) { - if (! fill_input_buf(rstrm)) + if (!fill_input_buf(rstrm)) return (FALSE); continue; } @@ -534,31 +527,33 @@ get_input_bytes(rstrm, addr, len) return (TRUE); } -static bool_t /* next two bytes of the input stream are treated as a header */ +static bool_t +/* next two bytes of the input stream are treated as a header */ set_input_fragment(rstrm) - register RECSTREAM *rstrm; +register RECSTREAM *rstrm; { u_long header; - if (! get_input_bytes(rstrm, (caddr_t)&header, sizeof(header))) + if (!get_input_bytes(rstrm, (caddr_t) & header, sizeof(header))) return (FALSE); - header = (long)ntohl(header); + header = (long) ntohl(header); rstrm->last_frag = ((header & LAST_FRAG) == 0) ? FALSE : TRUE; rstrm->fbtbc = header & (~LAST_FRAG); return (TRUE); } -static bool_t /* consumes input bytes; knows nothing about records! */ +static bool_t +/* consumes input bytes; knows nothing about records! */ skip_input_bytes(rstrm, cnt) - register RECSTREAM *rstrm; - long cnt; +register RECSTREAM *rstrm; +long cnt; { register int current; while (cnt > 0) { - current = (int)rstrm->in_boundry - (int)rstrm->in_finger; + current = (int) rstrm->in_boundry - (int) rstrm->in_finger; if (current == 0) { - if (! fill_input_buf(rstrm)) + if (!fill_input_buf(rstrm)) return (FALSE); continue; } @@ -569,9 +564,8 @@ skip_input_bytes(rstrm, cnt) return (TRUE); } -static u_int -fix_buf_size(s) - register u_int s; +static u_int fix_buf_size(s) +register u_int s; { if (s < 100) -- cgit v1.2.3