changeset 21381:4d574f60ad59

11063 acl_common.c: error: comparison between pointer and integer Reviewed by: Gergő Doma <domag02@gmail.com> Approved by: Gordon Ross <gwr@nexenta.com>
author Toomas Soome <tsoome@me.com>
date Sat, 18 May 2019 09:15:16 +0300
parents f11f6cfb99b1
children ea07f7be4ef8
files usr/src/common/acl/acl_common.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/common/acl/acl_common.c	Tue May 28 16:34:09 2019 +0000
+++ b/usr/src/common/acl/acl_common.c	Sat May 18 09:15:16 2019 +0300
@@ -1636,7 +1636,7 @@
 int
 acl_trivial_create(mode_t mode, boolean_t isdir, ace_t **acl, int *count)
 {
-	int 		index = 0;
+	int		index = 0;
 	int		error;
 	trivial_acl_t	masks;
 
@@ -1696,7 +1696,7 @@
 	uint64_t cookie = 0;
 
 	while ((cookie = walk(acep, cookie, aclcnt, &flags, &type, &mask))
-	    != NULL) {
+	    != 0) {
 		switch (flags & ACE_TYPE_FLAGS) {
 		case ACE_OWNER:
 		case ACE_GROUP|ACE_IDENTIFIER_GROUP: