d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make gcc happy.

Browse Source 
Reported by:	bz
This commit is contained in:
Pawel Jakub Dawidek 2015-01-30 13:03:36 +00:00
parent b4b884751b
commit 33c380b096
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=277927
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/libnv/nvlist.c
View File

@ -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_t *fdidxp, size_t *sizep)
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_t *fdidxp, size_t *sizep)
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;