Module Name: src
Committed By: dsl
Date: Thu Jan 3 16:41:52 UTC 2013
Modified Files:
src/external/cddl/osnet/dist/cmd/zfs: zfs_main.c
src/external/cddl/osnet/dist/common/nvpair: nvpair.c
src/external/cddl/osnet/dist/lib/libnvpair: libnvpair.c
src/external/cddl/osnet/dist/uts/common/sys/fs: zfs.h
Log Message:
Compilation fixes:
- include sys/ioctl.h
- NULL isn't an int constant
- %llf isn't a printf format
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/dist/cmd/zfs/zfs_main.c
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/external/cddl/osnet/dist/common/nvpair/nvpair.c
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/external/cddl/osnet/dist/lib/libnvpair/libnvpair.c
cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/dist/uts/common/sys/fs/zfs.h
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/cmd/zfs/zfs_main.c
diff -u src/external/cddl/osnet/dist/cmd/zfs/zfs_main.c:1.3 src/external/cddl/osnet/dist/cmd/zfs/zfs_main.c:1.4
--- src/external/cddl/osnet/dist/cmd/zfs/zfs_main.c:1.3 Sat Feb 27 23:43:52 2010
+++ src/external/cddl/osnet/dist/cmd/zfs/zfs_main.c Thu Jan 3 16:41:51 2013
@@ -1388,7 +1388,7 @@ zfs_do_get(int argc, char **argv)
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)
Index: src/external/cddl/osnet/dist/common/nvpair/nvpair.c
diff -u src/external/cddl/osnet/dist/common/nvpair/nvpair.c:1.1.1.2 src/external/cddl/osnet/dist/common/nvpair/nvpair.c:1.2
--- src/external/cddl/osnet/dist/common/nvpair/nvpair.c:1.1.1.2 Sat Feb 27 22:29:44 2010
+++ src/external/cddl/osnet/dist/common/nvpair/nvpair.c Thu Jan 3 16:41:51 2013
@@ -2377,7 +2377,7 @@ nvlist_xpack(nvlist_t *nvl, char **bufp,
*/
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)
Index: src/external/cddl/osnet/dist/lib/libnvpair/libnvpair.c
diff -u src/external/cddl/osnet/dist/lib/libnvpair/libnvpair.c:1.1.1.2 src/external/cddl/osnet/dist/lib/libnvpair/libnvpair.c:1.2
--- src/external/cddl/osnet/dist/lib/libnvpair/libnvpair.c:1.1.1.2 Sat Feb 27 22:30:14 2010
+++ src/external/cddl/osnet/dist/lib/libnvpair/libnvpair.c Thu Jan 3 16:41:51 2013
@@ -140,7 +140,7 @@ nvlist_print_with_indent(FILE *fp, nvlis
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: {
Index: src/external/cddl/osnet/dist/uts/common/sys/fs/zfs.h
diff -u src/external/cddl/osnet/dist/uts/common/sys/fs/zfs.h:1.3 src/external/cddl/osnet/dist/uts/common/sys/fs/zfs.h:1.4
--- src/external/cddl/osnet/dist/uts/common/sys/fs/zfs.h:1.3 Sat Feb 27 23:43:53 2010
+++ src/external/cddl/osnet/dist/uts/common/sys/fs/zfs.h Thu Jan 3 16:41:52 2013
@@ -28,6 +28,7 @@
#define _SYS_FS_ZFS_H
#include <sys/time.h>
+#include <sys/ioctl.h>
#ifdef __cplusplus
extern "C" {
