svn commit: r277927 - head/lib/libnv

[Pawel Jakub Dawidek]

Author: pjd
Date: Fri Jan 30 13:03:36 2015
New Revision: 277927
URL: https://svnweb.freebsd.org/changeset/base/277927

Log:
  Make gcc happy.
  
  Reported by:	bz

Modified:
  head/lib/libnv/nvlist.c

Modified: head/lib/libnv/nvlist.c
==============================================================================
--- head/lib/libnv/nvlist.c	Fri Jan 30 12:57:35 2015	(r277926)
+++ head/lib/libnv/nvlist.c	Fri Jan 30 13:03:36 2015	(r277927)
@@ -358,6 +358,7 @@ nvlist_dump(const nvlist_t *nvl, int fd)
 {
 	const nvlist_t *tmpnvl;
 	nvpair_t *nvp, *tmpnvp;
+	void *cookie;
 	int level;
 
 	level = 0;
@@ -419,9 +420,11 @@ nvlist_dump(const nvlist_t *nvl, int fd)
 		}
 
 		while ((nvp = nvlist_next_nvpair(nvl, nvp)) == NULL) {
-			nvl = nvlist_get_parent(nvl, (void **)&nvp);
+			cookie = NULL;
+			nvl = nvlist_get_parent(nvl, &cookie);
 			if (nvl == NULL)
 				return;
+			nvp = cookie;
 			level--;
 		}
 	}
@@ -443,6 +446,7 @@ nvlist_size(const nvlist_t *nvl)
 {
 	const nvlist_t *tmpnvl;
 	const nvpair_t *nvp, *tmpnvp;
+	void *cookie;
 	size_t size;
 
 	NVLIST_ASSERT(nvl);
@@ -469,9 +473,11 @@ nvlist_size(const nvlist_t *nvl)
 		}
 
 		while ((nvp = nvlist_next_nvpair(nvl, nvp)) == NULL) {
-			nvl = nvlist_get_parent(nvl, (void **)&nvp);
+			cookie = NULL;
+			nvl = nvlist_get_parent(nvl, &cookie);
 			if (nvl == NULL)
 				goto out;
+			nvp = cookie;
 		}
 	}
 
@@ -587,6 +593,7 @@ nvlist_xpack(const nvlist_t *nvl, int64_
 	size_t left, size;
 	const nvlist_t *tmpnvl;
 	nvpair_t *nvp, *tmpnvp;
+	void *cookie;
 
 	NVLIST_ASSERT(nvl);
 
@@ -655,9 +662,11 @@ nvlist_xpack(const nvlist_t *nvl, int64_
 			return (NULL);
 		}
 		while ((nvp = nvlist_next_nvpair(nvl, nvp)) == NULL) {
-			nvl = nvlist_get_parent(nvl, (void **)&nvp);
+			cookie = NULL;
+			nvl = nvlist_get_parent(nvl, &cookie);
 			if (nvl == NULL)
 				goto out;
+			nvp = cookie;
 			ptr = nvpair_pack_nvlist_up(ptr, &left);
 			if (ptr == NULL)
 				goto out;