From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54701) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZAGUw-0006ZV-Fb for qemu-devel@nongnu.org; Wed, 01 Jul 2015 07:48:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZAGUv-0005K1-JZ for qemu-devel@nongnu.org; Wed, 01 Jul 2015 07:48:14 -0400 Received: from mail-qk0-x230.google.com ([2607:f8b0:400d:c09::230]:33867) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZAGUv-0005Jw-GP for qemu-devel@nongnu.org; Wed, 01 Jul 2015 07:48:13 -0400 Received: by qkeo142 with SMTP id o142so26972057qke.1 for ; Wed, 01 Jul 2015 04:48:13 -0700 (PDT) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Wed, 1 Jul 2015 13:47:37 +0200 Message-Id: <1435751267-26378-3-git-send-email-marcandre.lureau@gmail.com> In-Reply-To: <1435751267-26378-1-git-send-email-marcandre.lureau@gmail.com> References: <1435751267-26378-1-git-send-email-marcandre.lureau@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH 02/12] qga: use exit() when parsing options List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , mdroth@linux.vnet.ibm.com The option parsing is going to be moved to a seperate function, use exit() consistantly. Signed-off-by: Marc-André Lureau --- 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