svn commit: r290767 - stable/10/cddl/contrib/opensolaris/cmd/zfs

Alexander Motin mav at FreeBSD.org
Fri Nov 13 10:32:35 UTC 2015


Author: mav
Date: Fri Nov 13 10:32:34 2015
New Revision: 290767
URL: https://svnweb.freebsd.org/changeset/base/290767

Log:
  Fix build on stable/10.

Modified:
  stable/10/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c

Modified: stable/10/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
==============================================================================
--- stable/10/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Fri Nov 13 09:52:36 2015	(r290766)
+++ stable/10/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Fri Nov 13 10:32:34 2015	(r290767)
@@ -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;
 	}


More information about the svn-src-all mailing list