提交 e7b7b617 编写于 作者: M Michal Privoznik

qemuBuildInterfaceCommandLine: Reorder VIR_FREE

When we have variables A, B, C then there are two ways to free
them. Either in the order they are declared or the reversed one.
Any other ordering is confusing. In this commit I'm reordering
calls to VIR_FREE in the reversed order.
Signed-off-by: NMichal Privoznik <mprivozn@redhat.com>
Reviewed-by: NErik Skultety <eskultet@redhat.com>
上级 18f90481
...@@ -8328,7 +8328,8 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, ...@@ -8328,7 +8328,8 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver,
int **nicindexes) int **nicindexes)
{ {
int ret = -1; int ret = -1;
char *nic = NULL, *host = NULL; char *nic = NULL;
char *host = NULL;
int *tapfd = NULL; int *tapfd = NULL;
size_t tapfdSize = 0; size_t tapfdSize = 0;
int *vhostfd = NULL; int *vhostfd = NULL;
...@@ -8595,24 +8596,24 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, ...@@ -8595,24 +8596,24 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver,
virSetError(saved_err); virSetError(saved_err);
virFreeError(saved_err); virFreeError(saved_err);
} }
for (i = 0; tapfd && i < tapfdSize && tapfd[i] >= 0; i++) {
if (ret < 0)
VIR_FORCE_CLOSE(tapfd[i]);
if (tapfdName)
VIR_FREE(tapfdName[i]);
}
for (i = 0; vhostfd && i < vhostfdSize && vhostfd[i] >= 0; i++) { for (i = 0; vhostfd && i < vhostfdSize && vhostfd[i] >= 0; i++) {
if (ret < 0) if (ret < 0)
VIR_FORCE_CLOSE(vhostfd[i]); VIR_FORCE_CLOSE(vhostfd[i]);
if (vhostfdName) if (vhostfdName)
VIR_FREE(vhostfdName[i]); VIR_FREE(vhostfdName[i]);
} }
VIR_FREE(tapfd); VIR_FREE(vhostfdName);
for (i = 0; tapfd && i < tapfdSize && tapfd[i] >= 0; i++) {
if (ret < 0)
VIR_FORCE_CLOSE(tapfd[i]);
if (tapfdName)
VIR_FREE(tapfdName[i]);
}
VIR_FREE(tapfdName);
VIR_FREE(vhostfd); VIR_FREE(vhostfd);
VIR_FREE(nic); VIR_FREE(tapfd);
VIR_FREE(host); VIR_FREE(host);
VIR_FREE(tapfdName); VIR_FREE(nic);
VIR_FREE(vhostfdName);
return ret; return ret;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册