haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

qga: use exit() when parsing options

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

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Denis V. Lunev <den@openvz.org>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
This commit is contained in:
Marc-André Lureau 2015-08-27 01:34:48 +02:00 committed by Michael Roth
parent 2e2a58e0e4
commit c6c84523cd
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
qga/main.c
View file

@ -992,14 +992,14 @@ int main(int argc, char **argv)
break; break;
case 'V': case 'V':
printf("QEMU Guest Agent %s\n", QEMU_VERSION); printf("QEMU Guest Agent %s\n", QEMU_VERSION);
return 0; exit(EXIT_SUCCESS);
case 'd': case 'd':
daemonize = 1; daemonize = 1;
break; break;
case 'b': { case 'b': {
if (is_help_option(optarg)) { if (is_help_option(optarg)) {
qmp_for_each_command(ga_print_cmd, NULL); qmp_for_each_command(ga_print_cmd, NULL);
return 0; exit(EXIT_SUCCESS);
} }
for (j = 0, i = 0, len = strlen(optarg); i < len; i++) { for (j = 0, i = 0, len = strlen(optarg); i < len; i++) {
if (optarg[i] == ',') { if (optarg[i] == ',') {
@ -1027,36 +1027,36 @@ int main(int argc, char **argv)
NULL : NULL :
state_dir; state_dir;
if (ga_install_vss_provider()) { if (ga_install_vss_provider()) {
return EXIT_FAILURE; exit(EXIT_FAILURE);
} }
if (ga_install_service(path, log_filepath, fixed_state_dir)) { 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) { } else if (strcmp(service, "uninstall") == 0) {
ga_uninstall_vss_provider(); ga_uninstall_vss_provider();
return ga_uninstall_service(); exit(ga_uninstall_service());
} else if (strcmp(service, "vss-install") == 0) { } else if (strcmp(service, "vss-install") == 0) {
if (ga_install_vss_provider()) { if (ga_install_vss_provider()) {
return EXIT_FAILURE; exit(EXIT_FAILURE);
} }
return EXIT_SUCCESS; exit(EXIT_SUCCESS);
} else if (strcmp(service, "vss-uninstall") == 0) { } else if (strcmp(service, "vss-uninstall") == 0) {
ga_uninstall_vss_provider(); ga_uninstall_vss_provider();
return EXIT_SUCCESS; exit(EXIT_SUCCESS);
} else { } else {
printf("Unknown service command.\n"); printf("Unknown service command.\n");
return EXIT_FAILURE; exit(EXIT_FAILURE);
} }
break; break;
#endif #endif
case 'h': case 'h':
usage(argv[0]); usage(argv[0]);
return 0; exit(EXIT_SUCCESS);
case '?': case '?':
g_print("Unknown option, try '%s --help' for more information.\n", g_print("Unknown option, try '%s --help' for more information.\n",
argv[0]); argv[0]);
return EXIT_FAILURE; exit(EXIT_FAILURE);
} }
} }