[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v2 02/12] qga: use exit() when parsing options
From: |
Michael Roth |
Subject: |
Re: [Qemu-devel] [PATCH v2 02/12] qga: use exit() when parsing options |
Date: |
Tue, 25 Aug 2015 17:27:46 -0500 |
User-agent: |
alot/0.3.6 |
Quoting address@hidden (2015-08-25 17:10:14)
> 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>
> ---
> 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);
> }
> }
>
> --
> 2.4.3
>
- [Qemu-devel] [PATCH v2 00/12] qemu-ga: add a configuration file, marcandre . lureau, 2015/08/25
- [Qemu-devel] [PATCH v2 01/12] qga: misc spelling, marcandre . lureau, 2015/08/25
- [Qemu-devel] [PATCH v2 02/12] qga: use exit() when parsing options, marcandre . lureau, 2015/08/25
- Re: [Qemu-devel] [PATCH v2 02/12] qga: use exit() when parsing options,
Michael Roth <=
- [Qemu-devel] [PATCH v2 03/12] qga: move string split in separate function, marcandre . lureau, 2015/08/25
- [Qemu-devel] [PATCH v2 05/12] qga: copy argument strings, marcandre . lureau, 2015/08/25
- [Qemu-devel] [PATCH v2 04/12] qga: rename 'path' to 'channel_path', marcandre . lureau, 2015/08/25
- [Qemu-devel] [PATCH v2 06/12] qga: move option parsing to seperate function, marcandre . lureau, 2015/08/25
- [Qemu-devel] [PATCH v2 09/12] qga: free a bit more, marcandre . lureau, 2015/08/25
- [Qemu-devel] [PATCH v2 07/12] qga: fill default options in main(), marcandre . lureau, 2015/08/25