mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-24 06:35:24 +00:00
interface: drop dead code
Coverity detected that ifaceGetNthParent had already dereferenced 'nth' prior to the conditional; all callers already complied with passing a non-NULL pointer so make this part of the contract. * src/util/interface.h (ifaceGetNthParent): Add annotations. * src/util/interface.c (ifaceGetNthParent): Drop useless null check.
This commit is contained in:
parent
0634b62336
commit
d69b79ab72
@ -1060,8 +1060,7 @@ ifaceGetNthParent(int ifindex, const char *ifname, unsigned int nthParent,
|
||||
i++;
|
||||
}
|
||||
|
||||
if (nth)
|
||||
*nth = i - 1;
|
||||
*nth = i - 1;
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
@ -1,6 +1,7 @@
|
||||
/*
|
||||
* interface.h: interface helper APIs for libvirt
|
||||
*
|
||||
* Copyright (C) 2011 Red Hat, Inc.
|
||||
* Copyright (C) 2010 IBM Corporation, Inc.
|
||||
*
|
||||
* See COPYING.LIB for the License of this software
|
||||
@ -67,7 +68,9 @@ int ifaceMacvtapLinkDump(bool nltarget_kernel, const char *ifname, int ifindex,
|
||||
|
||||
int ifaceGetNthParent(int ifindex, const char *ifname, unsigned int nthParent,
|
||||
int *parent_ifindex, char *parent_ifname,
|
||||
unsigned int *nth);
|
||||
unsigned int *nth)
|
||||
ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(4) ATTRIBUTE_NONNULL(5)
|
||||
ATTRIBUTE_NONNULL(6);
|
||||
|
||||
int ifaceReplaceMacAddress(const unsigned char *macaddress,
|
||||
const char *linkdev,
|
||||
|
Loading…
Reference in New Issue
Block a user