From owner-svn-src-head@freebsd.org Tue Sep 1 22:13:30 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5214437F63C; Tue, 1 Sep 2020 22:13:30 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1YQ1Chbz3Tdk; Tue, 1 Sep 2020 22:13:30 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0CCBA202D9; Tue, 1 Sep 2020 22:13:30 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081MDTx2062927; Tue, 1 Sep 2020 22:13:29 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081MDT0O062922; Tue, 1 Sep 2020 22:13:29 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012213.081MDT0O062922@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:13:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365224 - head/sys/xdr X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/xdr X-SVN-Commit-Revision: 365224 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:13:30 -0000 Author: mjg Date: Tue Sep 1 22:13:28 2020 New Revision: 365224 URL: https://svnweb.freebsd.org/changeset/base/365224 Log: xdr: clean up empty lines in .c and .h files Modified: head/sys/xdr/xdr.c head/sys/xdr/xdr_array.c head/sys/xdr/xdr_mbuf.c head/sys/xdr/xdr_mem.c head/sys/xdr/xdr_reference.c Modified: head/sys/xdr/xdr.c ============================================================================== --- head/sys/xdr/xdr.c Tue Sep 1 22:12:58 2020 (r365223) +++ head/sys/xdr/xdr.c Tue Sep 1 22:13:28 2020 (r365224) @@ -81,7 +81,7 @@ void xdr_free(xdrproc_t proc, void *objp) { XDR x; - + x.x_op = XDR_FREE; (*proc)(&x, objp); } @@ -96,7 +96,6 @@ xdr_void(void) return (TRUE); } - /* * XDR integers */ @@ -106,7 +105,6 @@ xdr_int(XDR *xdrs, int *ip) long l; switch (xdrs->x_op) { - case XDR_ENCODE: l = (long) *ip; return (XDR_PUTLONG(xdrs, &l)); @@ -134,7 +132,6 @@ xdr_u_int(XDR *xdrs, u_int *up) u_long l; switch (xdrs->x_op) { - case XDR_ENCODE: l = (u_long) *up; return (XDR_PUTLONG(xdrs, (long *)&l)); @@ -153,7 +150,6 @@ xdr_u_int(XDR *xdrs, u_int *up) return (FALSE); } - /* * XDR long integers * same as xdr_u_long - open coded to save a proc call! @@ -192,7 +188,6 @@ xdr_u_long(XDR *xdrs, u_long *ulp) return (FALSE); } - /* * XDR 32-bit integers * same as xdr_uint32_t - open coded to save a proc call! @@ -203,7 +198,6 @@ xdr_int32_t(XDR *xdrs, int32_t *int32_p) long l; switch (xdrs->x_op) { - case XDR_ENCODE: l = (long) *int32_p; return (XDR_PUTLONG(xdrs, &l)); @@ -232,7 +226,6 @@ xdr_uint32_t(XDR *xdrs, uint32_t *uint32_p) u_long l; switch (xdrs->x_op) { - case XDR_ENCODE: l = (u_long) *uint32_p; return (XDR_PUTLONG(xdrs, (long *)&l)); @@ -251,7 +244,6 @@ xdr_uint32_t(XDR *xdrs, uint32_t *uint32_p) return (FALSE); } - /* * XDR short integers */ @@ -261,7 +253,6 @@ xdr_short(XDR *xdrs, short *sp) long l; switch (xdrs->x_op) { - case XDR_ENCODE: l = (long) *sp; return (XDR_PUTLONG(xdrs, &l)); @@ -289,7 +280,6 @@ xdr_u_short(XDR *xdrs, u_short *usp) u_long l; switch (xdrs->x_op) { - case XDR_ENCODE: l = (u_long) *usp; return (XDR_PUTLONG(xdrs, (long *)&l)); @@ -308,7 +298,6 @@ xdr_u_short(XDR *xdrs, u_short *usp) return (FALSE); } - /* * XDR 16-bit integers */ @@ -318,7 +307,6 @@ xdr_int16_t(XDR *xdrs, int16_t *int16_p) long l; switch (xdrs->x_op) { - case XDR_ENCODE: l = (long) *int16_p; return (XDR_PUTLONG(xdrs, &l)); @@ -346,7 +334,6 @@ xdr_uint16_t(XDR *xdrs, uint16_t *uint16_p) u_long l; switch (xdrs->x_op) { - case XDR_ENCODE: l = (u_long) *uint16_p; return (XDR_PUTLONG(xdrs, (long *)&l)); @@ -365,7 +352,6 @@ xdr_uint16_t(XDR *xdrs, uint16_t *uint16_p) return (FALSE); } - /* * XDR a char */ @@ -407,7 +393,6 @@ xdr_bool(XDR *xdrs, bool_t *bp) long lb; switch (xdrs->x_op) { - case XDR_ENCODE: lb = *bp ? XDR_TRUE : XDR_FALSE; return (XDR_PUTLONG(xdrs, &lb)); @@ -524,7 +509,6 @@ xdr_bytes(XDR *xdrs, char **cpp, u_int *sizep, u_int m * now deal with the actual bytes */ switch (xdrs->x_op) { - case XDR_DECODE: if (nodesize == 0) { return (TRUE); @@ -614,13 +598,11 @@ xdr_union(XDR *xdrs, (*dfault)(xdrs, unp)); } - /* * Non-portable xdr primitives. * Care should be taken when moving these routines to new architectures. */ - /* * XDR null terminated ASCII strings * xdr_string deals with "C strings" - arrays of bytes that are @@ -664,7 +646,6 @@ xdr_string(XDR *xdrs, char **cpp, u_int maxsize) * now deal with the actual bytes */ switch (xdrs->x_op) { - case XDR_DECODE: if (nodesize == 0) { return (TRUE); @@ -747,7 +728,6 @@ xdr_int64_t(XDR *xdrs, int64_t *llp) return (FALSE); } - /* * XDR unsigned 64-bit integers */ @@ -778,7 +758,6 @@ xdr_uint64_t(XDR *xdrs, uint64_t *ullp) return (FALSE); } - /* * XDR hypers */ @@ -793,7 +772,6 @@ xdr_hyper(XDR *xdrs, longlong_t *llp) return (xdr_int64_t(xdrs, (int64_t *)llp)); } - /* * XDR unsigned hypers */ @@ -808,7 +786,6 @@ xdr_u_hyper(XDR *xdrs, u_longlong_t *ullp) return (xdr_uint64_t(xdrs, (uint64_t *)ullp)); } - /* * XDR longlong_t's */ @@ -822,7 +799,6 @@ xdr_longlong_t(XDR *xdrs, longlong_t *llp) */ return (xdr_int64_t(xdrs, (int64_t *)llp)); } - /* * XDR u_longlong_t's Modified: head/sys/xdr/xdr_array.c ============================================================================== --- head/sys/xdr/xdr_array.c Tue Sep 1 22:12:58 2020 (r365223) +++ head/sys/xdr/xdr_array.c Tue Sep 1 22:13:28 2020 (r365224) @@ -108,7 +108,7 @@ xdr_array(XDR *xdrs, case XDR_ENCODE: break; } - + /* * now we xdr each element of array */ Modified: head/sys/xdr/xdr_mbuf.c ============================================================================== --- head/sys/xdr/xdr_mbuf.c Tue Sep 1 22:12:58 2020 (r365223) +++ head/sys/xdr/xdr_mbuf.c Tue Sep 1 22:13:28 2020 (r365224) @@ -93,7 +93,7 @@ xdrmbuf_append(XDR *xdrs, struct mbuf *madd) m_freem(madd); return; } - + m = (struct mbuf *) xdrs->x_private; m->m_next = madd; @@ -206,7 +206,7 @@ xdrmbuf_getbytes(XDR *xdrs, char *addr, u_int len) xdrs->x_handy = 0; } } - + return (TRUE); } @@ -241,7 +241,7 @@ xdrmbuf_putbytes(XDR *xdrs, const char *addr, u_int le xdrs->x_handy = 0; } } - + return (TRUE); } Modified: head/sys/xdr/xdr_mem.c ============================================================================== --- head/sys/xdr/xdr_mem.c Tue Sep 1 22:12:58 2020 (r365223) +++ head/sys/xdr/xdr_mem.c Tue Sep 1 22:13:28 2020 (r365224) @@ -67,7 +67,7 @@ static bool_t xdrmem_setpos(XDR *, u_int); static int32_t *xdrmem_inline_aligned(XDR *, u_int); static int32_t *xdrmem_inline_unaligned(XDR *, u_int); static bool_t xdrmem_control(XDR *xdrs, int request, void *info); - + static const struct xdr_ops xdrmem_ops_aligned = { xdrmem_getlong_aligned, xdrmem_putlong_aligned, @@ -240,7 +240,6 @@ xdrmem_control(XDR *xdrs, int request, void *info) int len; switch (request) { - case XDR_GET_BYTES_AVAIL: xptr = (xdr_bytesrec *)info; xptr->xc_is_last_record = TRUE; @@ -269,7 +268,6 @@ xdrmem_control(XDR *xdrs, int request, void *info) xdrs->x_handy -= len; xdrs->x_private = (char *)xdrs->x_private + len; return (TRUE); - } return (FALSE); } Modified: head/sys/xdr/xdr_reference.c ============================================================================== --- head/sys/xdr/xdr_reference.c Tue Sep 1 22:12:58 2020 (r365223) +++ head/sys/xdr/xdr_reference.c Tue Sep 1 22:13:28 2020 (r365224) @@ -97,7 +97,6 @@ xdr_reference(XDR *xdrs, return (stat); } - /* * xdr_pointer(): *