aboutsummaryrefslogtreecommitdiff
path: root/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
diff options
context:
space:
mode:
authorJustin Hibbits <jhibbits@FreeBSD.org>2013-11-20 01:42:29 +0000
committerJustin Hibbits <jhibbits@FreeBSD.org>2013-11-20 01:42:29 +0000
commit59d74a351ffa3b22099c8b0d2f419eab6ca0de9d (patch)
tree6cac87e3535bd1ea2a68f867df32cce44e69719e /cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
parentde950c79f355a2b4c5dfb6b6ae2384066d814074 (diff)
downloadsrc-59d74a351ffa3b22099c8b0d2f419eab6ca0de9d.tar.gz
src-59d74a351ffa3b22099c8b0d2f419eab6ca0de9d.zip
Use 'int' to store the return value of getopt(), rather than char.
On some architectures (powerpc), char is unsigned by default, which means comparisons against -1 always fail, so the programs get stuck in an infinite loop. MFC after: 1 week
Notes
Notes: svn path=/head/; revision=258362
Diffstat (limited to 'cddl/contrib/opensolaris/cmd/zfs/zfs_main.c')
-rw-r--r--cddl/contrib/opensolaris/cmd/zfs/zfs_main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c b/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
index 6fd8950db93e..81e6e8cb2abf 100644
--- a/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
+++ b/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
@@ -2011,7 +2011,7 @@ zfs_do_upgrade(int argc, char **argv)
boolean_t showversions = B_FALSE;
int ret = 0;
upgrade_cbdata_t cb = { 0 };
- char c;
+ int c;
int flags = ZFS_ITER_ARGS_CAN_BE_PATHS;
/* check options */
@@ -3561,7 +3561,7 @@ static int
zfs_do_snapshot(int argc, char **argv)
{
int ret = 0;
- char c;
+ int c;
nvlist_t *props;
snap_cbdata_t sd = { 0 };
boolean_t multiple_snaps = B_FALSE;