[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/26] qga: use exit() when parsing options
From: |
Michael Roth |
Subject: |
[Qemu-devel] [PATCH 10/26] qga: use exit() when parsing options |
Date: |
Tue, 1 Sep 2015 12:00:50 -0500 |
From: Marc-André Lureau <address@hidden>
The option parsing is going to be moved to a separate function,
use exit() consistently.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Denis V. Lunev <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Michael Roth <address@hidden>
Signed-off-by: Michael Roth <address@hidden>
---
qga/main.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/qga/main.c b/qga/main.c
index 791982e..10bb2f7 100644
--- a/qga/main.c
+++ b/qga/main.c
@@ -992,14 +992,14 @@ int main(int argc, char **argv)
break;
case 'V':
printf("QEMU Guest Agent %s\n", QEMU_VERSION);
- return 0;
+ exit(EXIT_SUCCESS);
case 'd':
daemonize = 1;
break;
case 'b': {
if (is_help_option(optarg)) {
qmp_for_each_command(ga_print_cmd, NULL);
- return 0;
+ exit(EXIT_SUCCESS);
}
for (j = 0, i = 0, len = strlen(optarg); i < len; i++) {
if (optarg[i] == ',') {
@@ -1027,36 +1027,36 @@ int main(int argc, char **argv)
NULL :
state_dir;
if (ga_install_vss_provider()) {
- return EXIT_FAILURE;
+ exit(EXIT_FAILURE);
}
if (ga_install_service(path, log_filepath, fixed_state_dir)) {
- return EXIT_FAILURE;
+ exit(EXIT_FAILURE);
}
- return 0;
+ exit(EXIT_SUCCESS);
} else if (strcmp(service, "uninstall") == 0) {
ga_uninstall_vss_provider();
- return ga_uninstall_service();
+ exit(ga_uninstall_service());
} else if (strcmp(service, "vss-install") == 0) {
if (ga_install_vss_provider()) {
- return EXIT_FAILURE;
+ exit(EXIT_FAILURE);
}
- return EXIT_SUCCESS;
+ exit(EXIT_SUCCESS);
} else if (strcmp(service, "vss-uninstall") == 0) {
ga_uninstall_vss_provider();
- return EXIT_SUCCESS;
+ exit(EXIT_SUCCESS);
} else {
printf("Unknown service command.\n");
- return EXIT_FAILURE;
+ exit(EXIT_FAILURE);
}
break;
#endif
case 'h':
usage(argv[0]);
- return 0;
+ exit(EXIT_SUCCESS);
case '?':
g_print("Unknown option, try '%s --help' for more information.\n",
argv[0]);
- return EXIT_FAILURE;
+ exit(EXIT_FAILURE);
}
}
--
1.9.1
- [Qemu-devel] [PULL 00/26] qemu-ga patch queue for 2015-09-01, Michael Roth, 2015/09/01
- [Qemu-devel] [PATCH 11/26] qga: move string split in separate function, Michael Roth, 2015/09/01
- [Qemu-devel] [PATCH 10/26] qga: use exit() when parsing options,
Michael Roth <=
- [Qemu-devel] [PATCH 09/26] qga: misc spelling, Michael Roth, 2015/09/01
- [Qemu-devel] [PATCH 13/26] qga: rename 'path' to 'channel_path', Michael Roth, 2015/09/01
- [Qemu-devel] [PATCH 14/26] qga: copy argument strings, Michael Roth, 2015/09/01
- [Qemu-devel] [PATCH 15/26] qga: move option parsing to separate function, Michael Roth, 2015/09/01
- [Qemu-devel] [PATCH 17/26] qga: move agent run in a separate function, Michael Roth, 2015/09/01
- [Qemu-devel] [PATCH 18/26] qga: free a bit more, Michael Roth, 2015/09/01
- [Qemu-devel] [PATCH 16/26] qga: fill default options in main(), Michael Roth, 2015/09/01
- [Qemu-devel] [PATCH 01/26] qemu-ga: Add .msi files to .gitignore, Michael Roth, 2015/09/01
- [Qemu-devel] [PATCH 12/26] qga: make split_list() return allocated strings, Michael Roth, 2015/09/01
- [Qemu-devel] [PATCH 19/26] qga: add an optional qemu-ga.conf system configuration, Michael Roth, 2015/09/01