提交 ca3bef4c 编写于 作者: J John Ferlan

nwfilter: Clean up virNWFilterDetermineMissingVarsRec returns

Rather than using loop break;'s in order to force a return
of rc = -1, let's just return -1 immediately on the various
error paths and then return 0 on the success path.
上级 3e581d15
......@@ -515,15 +515,13 @@ virNWFilterDetermineMissingVarsRec(virNWFilterDefPtr filter,
virNWFilterVarAccessPrint(rule->varAccess[j], &buf);
if (virBufferError(&buf)) {
virReportOOMError();
rc = -1;
break;
return -1;
}
val = virNWFilterVarValueCreateSimpleCopyValue("1");
if (!val) {
virBufferFreeAndReset(&buf);
rc = -1;
break;
return -1;
}
varAccess = virBufferContentAndReset(&buf);
......@@ -532,21 +530,16 @@ virNWFilterDetermineMissingVarsRec(virNWFilterDefPtr filter,
VIR_FREE(varAccess);
}
}
if (rc)
break;
} else if (inc) {
VIR_DEBUG("Following filter %s", inc->filterref);
if (!(obj = virNWFilterObjListFindInstantiateFilter(driver->nwfilters,
inc->filterref))) {
rc = -1;
break;
}
inc->filterref)))
return -1;
/* create a temporary hashmap for depth-first tree traversal */
if (!(tmpvars = virNWFilterCreateVarsFrom(inc->params, vars))) {
rc = -1;
virNWFilterObjUnlock(obj);
break;
return -1;
}
next_filter = virNWFilterObjGetDef(obj);
......@@ -571,10 +564,10 @@ virNWFilterDetermineMissingVarsRec(virNWFilterDefPtr filter,
virNWFilterObjUnlock(obj);
if (rc < 0)
break;
return -1;
}
}
return rc;
return 0;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册