Module Name: src
Committed By: christos
Date: Sat Jan 26 20:15:50 UTC 2013
Modified Files:
src/external/cddl/osnet/dist/lib/libzfs/common: libzfs_util.c
Log Message:
Avoid comparison between pointer and integer.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_util.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_util.c
diff -u src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_util.c:1.5 src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_util.c:1.6
--- src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_util.c:1.5 Tue Jan 1 14:02:19 2013
+++ src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_util.c Sat Jan 26 15:15:50 2013
@@ -686,7 +686,7 @@ zcmd_alloc_dst_nvlist(libzfs_handle_t *h
len = 4*1024;
zc->zc_nvlist_dst_size = len;
if ((zc->zc_nvlist_dst = (uint64_t)(uintptr_t)
- zfs_alloc(hdl, zc->zc_nvlist_dst_size)) == NULL)
+ zfs_alloc(hdl, zc->zc_nvlist_dst_size)) == 0)
return (-1);
return (0);
@@ -702,8 +702,7 @@ zcmd_expand_dst_nvlist(libzfs_handle_t *
{
free((void *)(uintptr_t)zc->zc_nvlist_dst);
if ((zc->zc_nvlist_dst = (uint64_t)(uintptr_t)
- zfs_alloc(hdl, zc->zc_nvlist_dst_size))
- == NULL)
+ zfs_alloc(hdl, zc->zc_nvlist_dst_size)) == 0)
return (-1);
return (0);
