diff options
| author | nd150628 <none@none> | 2006-10-03 15:01:10 -0700 |
|---|---|---|
| committer | nd150628 <none@none> | 2006-10-03 15:01:10 -0700 |
| commit | 5ad820458efd0fdb914baff9c1447c22b819fa23 (patch) | |
| tree | 0986cce9a68a564167dded13501576679a4b94f3 /usr/src/cmd/zfs | |
| parent | a985e5786d4eb44e83b59c9c7e38bc77e12fec47 (diff) | |
| download | illumos-joyent-5ad820458efd0fdb914baff9c1447c22b819fa23.tar.gz | |
6463348 ZFS code could be more portable
Diffstat (limited to 'usr/src/cmd/zfs')
| -rw-r--r-- | usr/src/cmd/zfs/zfs_main.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/usr/src/cmd/zfs/zfs_main.c b/usr/src/cmd/zfs/zfs_main.c index eb5d4e4b75..5a662af70e 100644 --- a/usr/src/cmd/zfs/zfs_main.c +++ b/usr/src/cmd/zfs/zfs_main.c @@ -1869,7 +1869,6 @@ static int set_callback(zfs_handle_t *zhp, void *data) { set_cbdata_t *cbp = data; - int ret = 1; if (zfs_prop_set(zhp, cbp->cb_propname, cbp->cb_value) != 0) { switch (libzfs_errno(g_zfs)) { @@ -1884,9 +1883,7 @@ set_callback(zfs_handle_t *zhp, void *data) } return (1); } - ret = 0; -error: - return (ret); + return (0); } static int @@ -3014,7 +3011,7 @@ manual_unmount(int argc, char **argv) static int volcheck(zpool_handle_t *zhp, void *data) { - int isinit = (int)data; + boolean_t isinit = *((boolean_t *)data); if (isinit) return (zpool_create_zvol_links(zhp)); @@ -3029,7 +3026,7 @@ volcheck(zpool_handle_t *zhp, void *data) static int do_volcheck(boolean_t isinit) { - return (zpool_iter(g_zfs, volcheck, (void *)isinit) ? 1 : 0); + return (zpool_iter(g_zfs, volcheck, &isinit) ? 1 : 0); } int |