Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/cddl/osnet/dist/lib/libzfs/common Avoid comparison ...



details:   https://anonhg.NetBSD.org/src/rev/25a19cc7ccb0
branches:  trunk
changeset: 784365:25a19cc7ccb0
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Jan 26 20:15:50 2013 +0000

description:
Avoid comparison between pointer and integer.

diffstat:

 external/cddl/osnet/dist/lib/libzfs/common/libzfs_util.c |  5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diffs (22 lines):

diff -r a9b98f4bb0a5 -r 25a19cc7ccb0 external/cddl/osnet/dist/lib/libzfs/common/libzfs_util.c
--- a/external/cddl/osnet/dist/lib/libzfs/common/libzfs_util.c  Sat Jan 26 19:45:02 2013 +0000
+++ b/external/cddl/osnet/dist/lib/libzfs/common/libzfs_util.c  Sat Jan 26 20:15:50 2013 +0000
@@ -686,7 +686,7 @@
                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 @@
 {
        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);



Home | Main Index | Thread Index | Old Index