[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 02/12] qga: use exit() when parsing options
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH 02/12] qga: use exit() when parsing options |
Date: |
Wed, 1 Jul 2015 13:47:37 +0200 |
The option parsing is going to be moved to a seperate function,
use exit() consistantly.
Signed-off-by: Marc-André Lureau <address@hidden>
---
qga/main.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/qga/main.c b/qga/main.c
index 23cde01..af93992 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);
}
}
--
2.4.3
- [Qemu-devel] [PATCH 00/12] qemu-ga: add a configuration file, Marc-André Lureau, 2015/07/01
- [Qemu-devel] [PATCH 01/12] qga: misc spelling, Marc-André Lureau, 2015/07/01
- [Qemu-devel] [PATCH 02/12] qga: use exit() when parsing options,
Marc-André Lureau <=
- [Qemu-devel] [PATCH 03/12] qga: move string split in seperate function, Marc-André Lureau, 2015/07/01
- [Qemu-devel] [PATCH 04/12] qga: rename 'path' to 'device_path', Marc-André Lureau, 2015/07/01
- [Qemu-devel] [PATCH 05/12] qga: copy argument strings, Marc-André Lureau, 2015/07/01
- [Qemu-devel] [PATCH 06/12] qga: move option parsing to seperate function, Marc-André Lureau, 2015/07/01
- [Qemu-devel] [PATCH 07/12] qga: fill default options in main(), Marc-André Lureau, 2015/07/01
- [Qemu-devel] [PATCH 08/12] qga: move agent run in a seperate function, Marc-André Lureau, 2015/07/01
- [Qemu-devel] [PATCH 09/12] qga: free a bit more, Marc-André Lureau, 2015/07/01
- [Qemu-devel] [PATCH 11/12] qga: add an optionnal qemu-ga.conf system configuration, Marc-André Lureau, 2015/07/01
- [Qemu-devel] [PATCH 10/12] qga: add --dump-conf option, Marc-André Lureau, 2015/07/01