diff options
| author | kmacy <kmacy@FreeBSD.org> | 2009-05-30 22:23:58 +0000 |
|---|---|---|
| committer | kmacy <kmacy@FreeBSD.org> | 2009-05-30 22:23:58 +0000 |
| commit | 3b9ffe972e86709c49f8bd774244f584709604a8 (patch) | |
| tree | b02fd5938cb57833be3d79330c5f0d5c47249da9 /sys/rpc | |
| parent | d379120e43cca82a27e76d02526045e6b69d8d57 (diff) | |
| download | FreeBSD-src-3b9ffe972e86709c49f8bd774244f584709604a8.zip FreeBSD-src-3b9ffe972e86709c49f8bd774244f584709604a8.tar.gz | |
fix xdrmem_control to be safe in an if statement
fix zfs to depend on krpc
remove xdr from zfs makefile
Submitted by: dchagin@freebsd.org
Diffstat (limited to 'sys/rpc')
| -rw-r--r-- | sys/rpc/xdr.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/rpc/xdr.h b/sys/rpc/xdr.h index 9bc76b6..d57dd6b 100644 --- a/sys/rpc/xdr.h +++ b/sys/rpc/xdr.h @@ -216,8 +216,8 @@ xdr_putint32(XDR *xdrs, int32_t *ip) (*(xdrs)->x_ops->x_destroy)(xdrs) #define XDR_CONTROL(xdrs, req, op) \ - if ((xdrs)->x_ops->x_control) \ - (*(xdrs)->x_ops->x_control)(xdrs, req, op) + (((xdrs)->x_ops->x_control == NULL) ? (FALSE) : \ + (*(xdrs)->x_ops->x_control)(xdrs, req, op)) #define xdr_control(xdrs, req, op) XDR_CONTROL(xdrs, req, op) /* |
