diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2017-06-27 06:44:32 +0000 | 
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2017-06-27 06:44:32 +0000 | 
| commit | a3604b95ed1b025e84c6b948b9939cf63fc9f9ce (patch) | |
| tree | 6998e1bc3c80f5ac90fcd7497da4a1d547a8452e /cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c | |
| parent | edd7eaddc8e5730ca33436568f6fcb8409984d13 (diff) | |
| parent | f21680fd983784341c88dbe1015548f65c79868d (diff) | |
Notes
Diffstat (limited to 'cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c')
| -rw-r--r-- | cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c | 15 | 
1 files changed, 8 insertions, 7 deletions
diff --git a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c index 5cf090263758..3e24741b9832 100644 --- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c +++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c @@ -199,19 +199,19 @@ dump_record(dmu_replay_record_t *drr, void *payload, int payload_len,  {  	ASSERT3U(offsetof(dmu_replay_record_t, drr_u.drr_checksum.drr_checksum),  	    ==, sizeof (dmu_replay_record_t) - sizeof (zio_cksum_t)); -	fletcher_4_incremental_native(drr, +	(void) fletcher_4_incremental_native(drr,  	    offsetof(dmu_replay_record_t, drr_u.drr_checksum.drr_checksum), zc);  	if (drr->drr_type != DRR_BEGIN) {  		ASSERT(ZIO_CHECKSUM_IS_ZERO(&drr->drr_u.  		    drr_checksum.drr_checksum));  		drr->drr_u.drr_checksum.drr_checksum = *zc;  	} -	fletcher_4_incremental_native(&drr->drr_u.drr_checksum.drr_checksum, -	    sizeof (zio_cksum_t), zc); +	(void) fletcher_4_incremental_native( +	    &drr->drr_u.drr_checksum.drr_checksum, sizeof (zio_cksum_t), zc);  	if (write(outfd, drr, sizeof (*drr)) == -1)  		return (errno);  	if (payload_len != 0) { -		fletcher_4_incremental_native(payload, payload_len, zc); +		(void) fletcher_4_incremental_native(payload, payload_len, zc);  		if (write(outfd, payload, payload_len) == -1)  			return (errno);  	} @@ -2096,9 +2096,9 @@ recv_read(libzfs_handle_t *hdl, int fd, void *buf, int ilen,  	if (zc) {  		if (byteswap) -			fletcher_4_incremental_byteswap(buf, ilen, zc); +			(void) fletcher_4_incremental_byteswap(buf, ilen, zc);  		else -			fletcher_4_incremental_native(buf, ilen, zc); +			(void) fletcher_4_incremental_native(buf, ilen, zc);  	}  	return (0);  } @@ -3688,7 +3688,8 @@ zfs_receive_impl(libzfs_handle_t *hdl, const char *tosnap,  		 * recv_read() above; do it again correctly.  		 */  		bzero(&zcksum, sizeof (zio_cksum_t)); -		fletcher_4_incremental_byteswap(&drr, sizeof (drr), &zcksum); +		(void) fletcher_4_incremental_byteswap(&drr, +		    sizeof (drr), &zcksum);  		flags->byteswap = B_TRUE;  		drr.drr_type = BSWAP_32(drr.drr_type);  | 
