--- uts/common/fs/zfs/zap.c	2006/04/09 09:30:01
+++ uts/common/fs/zfs/zap.c	2006/08/15 20:34:30
@@ -62,17 +62,11 @@
 
 	block_type = *(uint64_t *)vbuf;
 
-	switch (block_type) {
-	case ZBT_LEAF:
-	case BSWAP_64(ZBT_LEAF):
+	if (block_type == ZBT_LEAF || block_type == BSWAP_64(ZBT_LEAF))
 		zap_leaf_byteswap(vbuf, size);
-		return;
-	case ZBT_HEADER:
-	case BSWAP_64(ZBT_HEADER):
-	default:
+	else {
 		/* it's a ptrtbl block */
 		byteswap_uint64_array(vbuf, size);
-		return;
 	}
 }
 
--- uts/common/fs/zfs/zap_micro.c	2006/04/09 09:30:01
+++ uts/common/fs/zfs/zap_micro.c	2006/08/15 20:34:30
@@ -62,15 +62,11 @@
 
 	block_type = *(uint64_t *)buf;
 
-	switch (block_type) {
-	case ZBT_MICRO:
-	case BSWAP_64(ZBT_MICRO):
+	if (block_type == ZBT_MICRO || block_type == BSWAP_64(ZBT_MICRO)) {
 		/* ASSERT(magic == ZAP_LEAF_MAGIC); */
 		mzap_byteswap(buf, size);
-		return;
-	default:
+	} else {
 		fzap_byteswap(buf, size);
-		return;
 	}
 }