Commit c6c84523 authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Michael Roth
Browse files

qga: use exit() when parsing options 



The option parsing is going to be moved to a separate function,
use exit() consistently.

Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: default avatarDenis V. Lunev <den@openvz.org>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarMichael Roth <mdroth@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Roth <mdroth@linux.vnet.ibm.com>
parent 2e2a58e0

qga/main.c

+12 −12
Original line number Diff line number Diff line
@@ -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);

        }

    }