[libvirt] [PATCH 3/3] virNetDevMacVLanCreateWithVPortProfile: Drop @ret
Usually, this variable is used to hold the return value for a
function of ours. Well, this is not the case. Its use does not
match our pattern and therefore it is very misleading. Drop it
and define an alternative @rc variable, but only in that single
block where it is needed.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
src/util/virnetdevmacvlan.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c
index 95ab447..c8c16b5 100644
--- a/src/util/virnetdevmacvlan.c
+++ b/src/util/virnetdevmacvlan.c
@@ -994,7 +994,6 @@ virNetDevMacVLanCreateWithVPortProfile(const char *ifnameRequested,
int retries, do_retry = 0;
uint32_t macvtapMode;
const char *ifnameCreated = NULL;
- int ret;
int vf = -1;
bool vnet_hdr = flags & VIR_NETDEV_MACVLAN_VNET_HDR;
@@ -1028,6 +1027,7 @@ virNetDevMacVLanCreateWithVPortProfile(const char *ifnameRequested,
}
if (ifnameRequested) {
+ int rc;
bool isAutoName
= (STRPREFIX(ifnameRequested, MACVTAP_NAME_PREFIX) ||
STRPREFIX(ifnameRequested, MACVLAN_NAME_PREFIX));
@@ -1035,11 +1035,11 @@ virNetDevMacVLanCreateWithVPortProfile(const char
*ifnameRequested,
VIR_INFO("Requested macvtap device name: %s", ifnameRequested);
virMutexLock(&virNetDevMacVLanCreateMutex);
- if ((ret = virNetDevExists(ifnameRequested)) < 0) {
+ if ((rc = virNetDevExists(ifnameRequested)) < 0) {
virMutexUnlock(&virNetDevMacVLanCreateMutex);
return -1;
}
- if (ret) {
+ if (rc) {
if (isAutoName)
goto create_name;
virReportSystemError(EEXIST,
--
2.8.4