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

Simplify the code by _not_ expecting success under 'fail'.

Browse Source 
Submitted by:	pjd@ and oshogbo@
MFC after:	1 month
Sponsored by:	Wheel Systems
This commit is contained in:
oshogbo 2017-09-21 10:18:02 +00:00
parent 5b3c574401
commit 7bed56b0fa
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sys/contrib/libnv/nvpair.c
View File

@ -1748,7 +1748,6 @@ nvpair_move_descriptor_array(const char *name, int *value, size_t nitems)
nvpair_t *nvp;
size_t i;
nvp = NULL;
if (value == NULL || nitems == 0) {
ERRNO_SET(EINVAL);
return (NULL);
@ -1763,19 +1762,20 @@ nvpair_move_descriptor_array(const char *name, int *value, size_t nitems)
nvp = nvpair_allocv(name, NV_TYPE_DESCRIPTOR_ARRAY,
(uint64_t)(uintptr_t)value, sizeof(value[0]) * nitems, nitems);
fail:
if (nvp == NULL) {
ERRNO_SAVE();
for (i = 0; i < nitems; i++) {
if (fd_is_valid(value[i]))
close(value[i]);
}
nv_free(value);
ERRNO_RESTORE();
}
if (nvp == NULL)
goto fail;
return (nvp);
fail:
ERRNO_SAVE();
for (i = 0; i < nitems; i++) {
if (fd_is_valid(value[i]))
close(value[i]);
}
nv_free(value);
ERRNO_RESTORE();
return (NULL);
}
#endif