--- common/nvpair/nvpair.c	2006/08/03 03:39:14
+++ common/nvpair/nvpair.c	2006/08/15 21:35:48
@@ -567,7 +567,7 @@
 	if (!(priv->nvp_stat & NV_STAT_EMBEDDED))
 		nv_mem_free(priv, nvl, NV_ALIGN(sizeof (nvlist_t)));
 	else
-		nvl->nvl_priv = NULL;
+		nvl->nvl_priv = 0;
 
 	nv_mem_free(priv, priv, sizeof (nvpriv_t));
 }
@@ -1794,7 +1794,7 @@
 {
 	int err;
 
-	if (nvl->nvl_priv == NULL)
+	if (nvl->nvl_priv == 0)
 		return (EFAULT);
 
 	/*
--- common/nvpair/nvpair_alloc_fixed.c	2006/04/09 09:30:01
+++ common/nvpair/nvpair_alloc_fixed.c	2006/08/15 21:35:48
@@ -69,7 +69,7 @@
 	uintptr_t lim = base + va_arg(valist, size_t);
 	nvbuf_t *nvb = (nvbuf_t *)P2ROUNDUP(base, sizeof (uintptr_t));
 
-	if (base == NULL || (uintptr_t)&nvb[1] > lim)
+	if (base == 0 || (uintptr_t)&nvb[1] > lim)
 		return (EINVAL);
 
 	nvb->nvb_buf = (uintptr_t)&nvb[0];
--- lib/libzfs/common/libzfs_config.c	2006/08/03 03:39:14
+++ lib/libzfs/common/libzfs_config.c	2006/08/15 21:32:51
@@ -140,7 +140,7 @@
 	 */
 	zc.zc_config_dst_size = 1024;
 	if ((zc.zc_config_dst = (uint64_t)(uintptr_t)
-	    zfs_alloc(hdl, zc.zc_config_dst_size)) == NULL)
+	    zfs_alloc(hdl, zc.zc_config_dst_size)) == 0)
 		return (-1);
 	for (;;) {
 		zc.zc_cookie = hdl->libzfs_ns_gen;
@@ -156,8 +156,7 @@
 			case ENOMEM:
 				free((void *)(uintptr_t)zc.zc_config_dst);
 				if ((zc.zc_config_dst = (uint64_t)(uintptr_t)
-				    zfs_alloc(hdl, zc.zc_config_dst_size))
-				    == NULL)
+				    zfs_alloc(hdl, zc.zc_config_dst_size)) == 0)
 					return (-1);
 				break;
 
@@ -265,7 +264,7 @@
 
 	zc.zc_config_dst_size = zhp->zpool_config_size;
 	if ((zc.zc_config_dst = (uint64_t)(uintptr_t)
-	    zfs_alloc(zhp->zpool_hdl, zc.zc_config_dst_size)) == NULL)
+	    zfs_alloc(zhp->zpool_hdl, zc.zc_config_dst_size)) == 0)
 		return (-1);
 
 	for (;;) {
@@ -282,7 +281,7 @@
 			free((void *)(uintptr_t)zc.zc_config_dst);
 			if ((zc.zc_config_dst = (uint64_t)(uintptr_t)
 			    zfs_alloc(zhp->zpool_hdl,
-			    zc.zc_config_dst_size)) == NULL)
+			    zc.zc_config_dst_size)) == 0)
 				return (-1);
 		} else {
 			free((void *)(uintptr_t)zc.zc_config_dst);
--- lib/libzfs/common/libzfs_dataset.c	2006/08/03 03:39:14
+++ lib/libzfs/common/libzfs_dataset.c	2006/08/15 20:23:13
@@ -195,7 +195,7 @@
 
 	(void) strlcpy(zc.zc_name, zhp->zfs_name, sizeof (zc.zc_name));
 
-	if ((zc.zc_config_src = (uint64_t)(uintptr_t)malloc(1024)) == NULL)
+	if ((zc.zc_config_src = (uint64_t)(uintptr_t)malloc(1024)) == 0)
 		return (-1);
 	zc.zc_config_src_size = 1024;
 
@@ -203,7 +203,7 @@
 		if (errno == ENOMEM) {
 			free((void *)(uintptr_t)zc.zc_config_src);
 			if ((zc.zc_config_src = (uint64_t)(uintptr_t)
-			    malloc(zc.zc_config_src_size)) == NULL)
+			    malloc(zc.zc_config_src_size)) == 0)
 				return (-1);
 		} else {
 			free((void *)(uintptr_t)zc.zc_config_src);
--- lib/libzfs/common/libzfs_import.c	2006/08/03 03:39:14
+++ lib/libzfs/common/libzfs_import.c	2006/08/15 21:32:51
@@ -593,14 +593,14 @@
 
 		zc.zc_config_dst_size = 2 * len;
 		if ((zc.zc_config_dst = (uint64_t)(uintptr_t)
-		    zfs_alloc(hdl, zc.zc_config_dst_size)) == NULL)
+		    zfs_alloc(hdl, zc.zc_config_dst_size)) == 0)
 			goto nomem;
 
 		while ((err = ioctl(hdl->libzfs_fd, ZFS_IOC_POOL_TRYIMPORT,
 		    &zc)) != 0 && errno == ENOMEM) {
 			free((void *)(uintptr_t)zc.zc_config_dst);
 			if ((zc.zc_config_dst = (uint64_t)(uintptr_t)
-			    zfs_alloc(hdl, zc.zc_config_dst_size)) == NULL)
+			    zfs_alloc(hdl, zc.zc_config_dst_size)) == 0)
 				goto nomem;
 		}
 
--- lib/libzfs/common/libzfs_pool.c	2006/08/03 03:39:14
+++ lib/libzfs/common/libzfs_pool.c	2006/08/15 21:32:51
@@ -482,7 +482,7 @@
 	    ZFS_TYPE_FILESYSTEM)) == NULL)
 		return (-1);
 
-	if (zpool_remove_zvol_links(zhp) != NULL)
+	if (zpool_remove_zvol_links(zhp) != 0)
 		return (-1);
 
 	(void) strlcpy(zc.zc_name, zhp->zpool_name, sizeof (zc.zc_name));
@@ -1511,7 +1511,7 @@
 	verify(nvlist_lookup_uint64(zhp->zpool_config, ZPOOL_CONFIG_ERRCOUNT,
 	    &count) == 0);
 	if ((zc.zc_config_dst = (uintptr_t)zfs_alloc(zhp->zpool_hdl,
-	    count * sizeof (zbookmark_t))) == NULL)
+	    count * sizeof (zbookmark_t))) == 0)
 		return (-1);
 	zc.zc_config_dst_size = count;
 	(void) strcpy(zc.zc_name, zhp->zpool_name);
@@ -1522,7 +1522,7 @@
 			if (errno == ENOMEM) {
 				if ((zc.zc_config_dst = (uintptr_t)
 				    zfs_alloc(zhp->zpool_hdl,
-				    zc.zc_config_dst_size)) == NULL)
+				    zc.zc_config_dst_size)) == 0)
 					return (-1);
 			} else {
 				return (-1);
--- uts/common/fs/zfs/zil.c	2006/08/03 03:39:14
+++ uts/common/fs/zfs/zil.c	2006/08/15 20:34:57
@@ -1092,7 +1092,7 @@
 zil_init(void)
 {
 	zil_lwb_cache = kmem_cache_create("zil_lwb_cache",
-	    sizeof (struct lwb), NULL, NULL, NULL, NULL, NULL, NULL, 0);
+	    sizeof (struct lwb), 0, NULL, NULL, NULL, NULL, NULL, 0);
 }
 
 void
--- uts/common/fs/zfs/zfs_ioctl.c	2006/08/03 03:39:14
+++ uts/common/fs/zfs/zfs_ioctl.c	2006/08/21 20:18:42
@@ -691,7 +691,7 @@
 
 	dmu_objset_stats(os, &zc->zc_objset_stats);
 
-	if (zc->zc_config_src != NULL &&
+	if (zc->zc_config_src != 0 &&
 	    (error = dsl_prop_get_all(os, &nv)) == 0) {
 		VERIFY(nvlist_size(nv, &sz, NV_ENCODE_NATIVE) == 0);
 		if (sz > zc->zc_config_src_size) {