From 919f1431f035c123b6b6e1efa2554b6e8729b494 Mon Sep 17 00:00:00 2001 From: Andrew Stormont Date: Tue, 1 Aug 2017 21:48:09 +0100 Subject: [PATCH] 8654 unused local typedef in rpc code Reviewed by: Toomas Soome Reviewed by: Yuri Pankov Approved by: Dan McDonald --- usr/src/uts/common/rpc/xdr_sizeof.c | 12 ++++-------- usr/src/uts/common/rpc/xdrrdma_sizeof.c | 11 ++++------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/usr/src/uts/common/rpc/xdr_sizeof.c b/usr/src/uts/common/rpc/xdr_sizeof.c index 1cb1f593f4..9d3d231799 100644 --- a/usr/src/uts/common/rpc/xdr_sizeof.c +++ b/usr/src/uts/common/rpc/xdr_sizeof.c @@ -25,6 +25,7 @@ */ /* * Copyright 2012 Nexenta Systems, Inc. All rights reserved. + * Copyright 2017 RackTop Systems. */ #include @@ -112,11 +113,6 @@ xdr_sizeof(xdrproc_t func, void *data) XDR x; struct xdr_ops ops; bool_t stat; - /* to stop ANSI-C compiler from complaining */ - typedef bool_t (* dummyfunc1)(XDR *, long *); - typedef bool_t (* dummyfunc2)(XDR *, caddr_t, int); - typedef bool_t (* dummyfunc3)(XDR *, int32_t *); - typedef bool_t (* dummyfunc4)(XDR *, int, void *); ops.x_putbytes = x_putbytes; ops.x_inline = x_inline; @@ -125,13 +121,13 @@ xdr_sizeof(xdrproc_t func, void *data) ops.x_destroy = x_destroy; #if defined(_LP64) || defined(_KERNEL) - ops.x_getint32 = (dummyfunc3)harmless; + ops.x_getint32 = (void *)harmless; ops.x_putint32 = x_putint32_t; #endif /* the other harmless ones */ - ops.x_getbytes = (dummyfunc2)harmless; - ops.x_control = (dummyfunc4)harmless; + ops.x_getbytes = (void *)harmless; + ops.x_control = (void *)harmless; x.x_op = XDR_ENCODE; x.x_ops = &ops; diff --git a/usr/src/uts/common/rpc/xdrrdma_sizeof.c b/usr/src/uts/common/rpc/xdrrdma_sizeof.c index c22037e8b6..fb767d4195 100644 --- a/usr/src/uts/common/rpc/xdrrdma_sizeof.c +++ b/usr/src/uts/common/rpc/xdrrdma_sizeof.c @@ -21,6 +21,8 @@ /* * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * + * Copyright 2017 RackTop Systems. */ #include @@ -274,11 +276,6 @@ xdrrdma_xops(void) { static struct xdr_ops ops; - /* to stop ANSI-C compiler from complaining */ - typedef bool_t (* dummyfunc1)(XDR *, long *); - typedef bool_t (* dummyfunc2)(XDR *, caddr_t, int); - typedef bool_t (* dummyfunc3)(XDR *, int32_t *); - ops.x_putbytes = x_putbytes; ops.x_inline = x_inline; ops.x_getpostn = x_getpostn; @@ -287,12 +284,12 @@ xdrrdma_xops(void) ops.x_control = x_control; #if defined(_LP64) || defined(_KERNEL) - ops.x_getint32 = (dummyfunc3)harmless; + ops.x_getint32 = (void *)harmless; ops.x_putint32 = x_putint32_t; #endif /* the other harmless ones */ - ops.x_getbytes = (dummyfunc2)harmless; + ops.x_getbytes = (void *)harmless; return (&ops); } -- 2.11.4.GIT