mirror of
https://github.com/libvirt/libvirt.git
synced 2025-02-25 18:55:26 -06:00
event-test: Use goto cleanup instead of if else jungle
Like in the rest of our code we tend to prefer 'goto' and 'cleanup' over 'if else' code structure. Do the same here. Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
parent
950a90d489
commit
bde75a895d
@ -616,6 +616,8 @@ static void stop(int sig)
|
|||||||
|
|
||||||
int main(int argc, char **argv)
|
int main(int argc, char **argv)
|
||||||
{
|
{
|
||||||
|
int ret = EXIT_FAILURE;
|
||||||
|
virConnectPtr dconn = NULL;
|
||||||
int callback1ret = -1;
|
int callback1ret = -1;
|
||||||
int callback2ret = -1;
|
int callback2ret = -1;
|
||||||
int callback3ret = -1;
|
int callback3ret = -1;
|
||||||
@ -643,28 +645,27 @@ int main(int argc, char **argv)
|
|||||||
|
|
||||||
if (argc > 1 && STREQ(argv[1], "--help")) {
|
if (argc > 1 && STREQ(argv[1], "--help")) {
|
||||||
usage(argv[0]);
|
usage(argv[0]);
|
||||||
return -1;
|
goto cleanup;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (virInitialize() < 0) {
|
if (virInitialize() < 0) {
|
||||||
fprintf(stderr, "Failed to initialize libvirt");
|
fprintf(stderr, "Failed to initialize libvirt");
|
||||||
return -1;
|
goto cleanup;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (virEventRegisterDefaultImpl() < 0) {
|
if (virEventRegisterDefaultImpl() < 0) {
|
||||||
virErrorPtr err = virGetLastError();
|
virErrorPtr err = virGetLastError();
|
||||||
fprintf(stderr, "Failed to register event implementation: %s\n",
|
fprintf(stderr, "Failed to register event implementation: %s\n",
|
||||||
err && err->message ? err->message: "Unknown error");
|
err && err->message ? err->message: "Unknown error");
|
||||||
return -1;
|
goto cleanup;
|
||||||
}
|
}
|
||||||
|
|
||||||
virConnectPtr dconn = NULL;
|
|
||||||
dconn = virConnectOpenAuth(argc > 1 ? argv[1] : NULL,
|
dconn = virConnectOpenAuth(argc > 1 ? argv[1] : NULL,
|
||||||
virConnectAuthPtrDefault,
|
virConnectAuthPtrDefault,
|
||||||
VIR_CONNECT_RO);
|
VIR_CONNECT_RO);
|
||||||
if (!dconn) {
|
if (!dconn) {
|
||||||
printf("error opening\n");
|
printf("error opening\n");
|
||||||
return -1;
|
goto cleanup;
|
||||||
}
|
}
|
||||||
|
|
||||||
virConnectRegisterCloseCallback(dconn,
|
virConnectRegisterCloseCallback(dconn,
|
||||||
@ -769,24 +770,26 @@ int main(int argc, char **argv)
|
|||||||
VIR_DOMAIN_EVENT_CALLBACK(myDomainEventDeviceAddedCallback),
|
VIR_DOMAIN_EVENT_CALLBACK(myDomainEventDeviceAddedCallback),
|
||||||
strdup("device added"), myFreeFunc);
|
strdup("device added"), myFreeFunc);
|
||||||
|
|
||||||
if ((callback1ret != -1) &&
|
if ((callback1ret == -1) ||
|
||||||
(callback2ret != -1) &&
|
(callback2ret == -1) ||
|
||||||
(callback3ret != -1) &&
|
(callback3ret == -1) ||
|
||||||
(callback4ret != -1) &&
|
(callback4ret == -1) ||
|
||||||
(callback5ret != -1) &&
|
(callback5ret == -1) ||
|
||||||
(callback6ret != -1) &&
|
(callback6ret == -1) ||
|
||||||
(callback7ret != -1) &&
|
(callback7ret == -1) ||
|
||||||
(callback9ret != -1) &&
|
(callback9ret == -1) ||
|
||||||
(callback10ret != -1) &&
|
(callback10ret == -1) ||
|
||||||
(callback11ret != -1) &&
|
(callback11ret == -1) ||
|
||||||
(callback12ret != -1) &&
|
(callback12ret == -1) ||
|
||||||
(callback13ret != -1) &&
|
(callback13ret == -1) ||
|
||||||
(callback14ret != -1) &&
|
(callback14ret == -1) ||
|
||||||
(callback15ret != -1) &&
|
(callback15ret == -1) ||
|
||||||
(callback16ret != -1) &&
|
(callback16ret == -1) ||
|
||||||
(callback17ret != -1) &&
|
(callback17ret == -1) ||
|
||||||
(callback18ret != -1) &&
|
(callback18ret == -1) ||
|
||||||
(callback19ret != -1)) {
|
(callback19ret == -1))
|
||||||
|
goto cleanup;
|
||||||
|
|
||||||
if (virConnectSetKeepAlive(dconn, 5, 3) < 0) {
|
if (virConnectSetKeepAlive(dconn, 5, 3) < 0) {
|
||||||
virErrorPtr err = virGetLastError();
|
virErrorPtr err = virGetLastError();
|
||||||
fprintf(stderr, "Failed to start keepalive protocol: %s\n",
|
fprintf(stderr, "Failed to start keepalive protocol: %s\n",
|
||||||
@ -824,14 +827,18 @@ int main(int argc, char **argv)
|
|||||||
|
|
||||||
if (callback8ret != -1)
|
if (callback8ret != -1)
|
||||||
virConnectDomainEventDeregisterAny(dconn, callback8ret);
|
virConnectDomainEventDeregisterAny(dconn, callback8ret);
|
||||||
}
|
|
||||||
|
|
||||||
virConnectUnregisterCloseCallback(dconn, connectClose);
|
virConnectUnregisterCloseCallback(dconn, connectClose);
|
||||||
|
ret = EXIT_SUCCESS;
|
||||||
|
|
||||||
|
|
||||||
|
cleanup:
|
||||||
|
if (dconn) {
|
||||||
VIR_DEBUG("Closing connection");
|
VIR_DEBUG("Closing connection");
|
||||||
if (dconn && virConnectClose(dconn) < 0)
|
if (virConnectClose(dconn) < 0)
|
||||||
printf("error closing\n");
|
printf("error closing\n");
|
||||||
|
|
||||||
printf("done\n");
|
printf("done\n");
|
||||||
return 0;
|
}
|
||||||
|
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user