svn commit: r302659 - vendor-sys/illumos/dist/common/zfs vendor/illumos/dist/lib/libzfs/common

Andriy Gapon avg at FreeBSD.org
Tue Jul 12 12:00:32 UTC 2016


Author: avg
Date: Tue Jul 12 12:00:31 2016
New Revision: 302659
URL: https://svnweb.freebsd.org/changeset/base/302659

Log:
  6931 lib/libzfs: cleanup gcc warnings
  
  illumos/illumos-gate at 88f61dee20b358671b1b643e9d1dbf220a1d69be
  https://github.com/illumos/illumos-gate/commit/88f61dee20b358671b1b643e9d1dbf220a1d69be
  
  https://www.illumos.org/issues/6931
    need cleanup:
    CERRWARN += -_gcc=-Wno-switch
    CERRWARN += -_gcc=-Wno-parentheses
    CERRWARN += -_gcc=-Wno-unused-function
  
  Reviewed by: Matthew Ahrens <mahrens at delphix.com>
  Approved by: Robert Mustacchi <rm at joyent.com>
  Author: Igor Kozhukhov <ikozhukhov at gmail.com>

Modified:
  vendor-sys/illumos/dist/common/zfs/zfs_deleg.c

Changes in other areas also in this revision:
Modified:
  vendor/illumos/dist/lib/libzfs/common/libzfs_changelist.c
  vendor/illumos/dist/lib/libzfs/common/libzfs_dataset.c
  vendor/illumos/dist/lib/libzfs/common/libzfs_diff.c
  vendor/illumos/dist/lib/libzfs/common/libzfs_mount.c
  vendor/illumos/dist/lib/libzfs/common/libzfs_pool.c
  vendor/illumos/dist/lib/libzfs/common/libzfs_sendrecv.c
  vendor/illumos/dist/lib/libzfs/common/libzfs_util.c

Modified: vendor-sys/illumos/dist/common/zfs/zfs_deleg.c
==============================================================================
--- vendor-sys/illumos/dist/common/zfs/zfs_deleg.c	Tue Jul 12 11:59:25 2016	(r302658)
+++ vendor-sys/illumos/dist/common/zfs/zfs_deleg.c	Tue Jul 12 12:00:31 2016	(r302659)
@@ -22,6 +22,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2010 Nexenta Systems, Inc. All rights reserved.
  * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright 2016 Igor Kozhukhov <ikozhukhov at gmail.com>
  */
 
 #include <sys/zfs_context.h>
@@ -177,8 +178,9 @@ zfs_deleg_verify_nvlist(nvlist_t *nvp)
 			    nvpair_name(perm_name));
 			if (error)
 				return (-1);
-		} while (perm_name = nvlist_next_nvpair(perms, perm_name));
-	} while (who = nvlist_next_nvpair(nvp, who));
+		} while ((perm_name = nvlist_next_nvpair(perms, perm_name))
+		    != NULL);
+	} while ((who = nvlist_next_nvpair(nvp, who)) != NULL);
 	return (0);
 }
 


More information about the svn-src-all mailing list