[src/trunk]: src/external/cddl/osnet/dist Compilation fixes:

[dsl <dsl%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b690ece67819
branches:  trunk
changeset: 783679:b690ece67819
user:      dsl <dsl%NetBSD.org@localhost>
date:      Thu Jan 03 16:41:51 2013 +0000

description:
Compilation fixes:
- include sys/ioctl.h
- NULL isn't an int constant
- %llf isn't a printf format

diffstat:

 external/cddl/osnet/dist/cmd/zfs/zfs_main.c        |  2 +-
 external/cddl/osnet/dist/common/nvpair/nvpair.c    |  2 +-
 external/cddl/osnet/dist/lib/libnvpair/libnvpair.c |  2 +-
 external/cddl/osnet/dist/uts/common/sys/fs/zfs.h   |  1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diffs (47 lines):

diff -r ec1b2348e983 -r b690ece67819 external/cddl/osnet/dist/cmd/zfs/zfs_main.c
--- a/external/cddl/osnet/dist/cmd/zfs/zfs_main.c       Thu Jan 03 16:27:48 2013 +0000
+++ b/external/cddl/osnet/dist/cmd/zfs/zfs_main.c       Thu Jan 03 16:41:51 2013 +0000
@@ -1388,7 +1388,7 @@
        cb.cb_first = B_TRUE;
 
        /* run for each object */
-       ret = zfs_for_each(argc, argv, flags, ZFS_TYPE_DATASET, NULL,
+       ret = zfs_for_each(argc, argv, flags, ZFS_TYPE_DATASET, 0,
            &cb.cb_proplist, limit, get_callback, &cb);
 
        if (cb.cb_proplist == &fake_name)
diff -r ec1b2348e983 -r b690ece67819 external/cddl/osnet/dist/common/nvpair/nvpair.c
--- a/external/cddl/osnet/dist/common/nvpair/nvpair.c   Thu Jan 03 16:27:48 2013 +0000
+++ b/external/cddl/osnet/dist/common/nvpair/nvpair.c   Thu Jan 03 16:41:51 2013 +0000
@@ -2377,7 +2377,7 @@
         */
        nv_priv_init(&nvpriv, nva, 0);
 
-       if (err = nvlist_size(nvl, &alloc_size, encoding))
+       if ((err = nvlist_size(nvl, &alloc_size, encoding)))
                return (err);
 
        if ((buf = nv_mem_zalloc(&nvpriv, alloc_size)) == NULL)
diff -r ec1b2348e983 -r b690ece67819 external/cddl/osnet/dist/lib/libnvpair/libnvpair.c
--- a/external/cddl/osnet/dist/lib/libnvpair/libnvpair.c        Thu Jan 03 16:27:48 2013 +0000
+++ b/external/cddl/osnet/dist/lib/libnvpair/libnvpair.c        Thu Jan 03 16:41:51 2013 +0000
@@ -140,7 +140,7 @@
                case DATA_TYPE_DOUBLE: {
                        double val;
                        (void) nvpair_value_double(nvp, &val);
-                       (void) fprintf(fp, " 0x%llf", val);
+                       (void) fprintf(fp, " 0x%f", val);
                        break;
                }
                case DATA_TYPE_STRING: {
diff -r ec1b2348e983 -r b690ece67819 external/cddl/osnet/dist/uts/common/sys/fs/zfs.h
--- a/external/cddl/osnet/dist/uts/common/sys/fs/zfs.h  Thu Jan 03 16:27:48 2013 +0000
+++ b/external/cddl/osnet/dist/uts/common/sys/fs/zfs.h  Thu Jan 03 16:41:51 2013 +0000
@@ -28,6 +28,7 @@
 #define        _SYS_FS_ZFS_H
 
 #include <sys/time.h>
+#include <sys/ioctl.h>
 
 #ifdef __cplusplus
 extern "C" {