From ed306aea40611adf6bd1bb3783d296f6e84c9382 Mon Sep 17 00:00:00 2001 From: mav Date: Fri, 13 Nov 2015 10:32:34 +0000 Subject: [PATCH] Fix build on stable/10. git-svn-id: svn://svn.freebsd.org/base/stable/10@290767 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- cddl/contrib/opensolaris/cmd/zfs/zfs_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c b/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c index b48aa4de1..e0fb9534d 100644 --- a/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c +++ b/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c @@ -3579,7 +3579,7 @@ zfs_do_set(int argc, char **argv) { nvlist_t *props = NULL; int ds_start = -1; /* argv idx of first dataset arg */ - int ret = 0; + int i, ret = 0; /* check for options */ if (argc > 1 && argv[1][0] == '-') { @@ -3605,7 +3605,7 @@ zfs_do_set(int argc, char **argv) } /* validate argument order: prop=val args followed by dataset args */ - for (int i = 1; i < argc; i++) { + for (i = 1; i < argc; i++) { if (strchr(argv[i], '=') != NULL) { if (ds_start > 0) { /* out-of-order prop=val argument */ @@ -3625,7 +3625,7 @@ zfs_do_set(int argc, char **argv) /* Populate a list of property settings */ if (nvlist_alloc(&props, NV_UNIQUE_NAME, 0) != 0) nomem(); - for (int i = 1; i < ds_start; i++) { + for (i = 1; i < ds_start; i++) { if ((ret = parseprop(props, argv[i])) != 0) goto error; } -- 2.45.0