From patchwork Wed Aug 26 10:05:15 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 510784 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 5D0A61401F0 for ; Wed, 26 Aug 2015 20:10:39 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=ddTSk2eo; dkim-atps=neutral Received: from localhost ([::1]:37129 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZUXfB-0000IV-C8 for incoming@patchwork.ozlabs.org; Wed, 26 Aug 2015 06:10:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60894) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZUXaJ-0000Qe-3M for qemu-devel@nongnu.org; Wed, 26 Aug 2015 06:05:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZUXaI-00077i-3J for qemu-devel@nongnu.org; Wed, 26 Aug 2015 06:05:34 -0400 Received: from mail-qg0-x229.google.com ([2607:f8b0:400d:c04::229]:35241) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZUXaH-00077O-VB for qemu-devel@nongnu.org; Wed, 26 Aug 2015 06:05:34 -0400 Received: by qgj62 with SMTP id 62so122945464qgj.2 for ; Wed, 26 Aug 2015 03:05:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=WaMU+QyGFQ70hJEx+nl1fiVehrQjmIisDH9LIsMx2xI=; b=ddTSk2eoS9NGcautN0w4yUa1xYqGEOvLxGqbflvnDGKQ8mmyZo6uQL3LLD0bKKLeae 1JKjajD5bYTT9HcLYQa9vwLERc4EX77SVIw68ShOyKwnLWu3VRO03zmGbwSAz/iVQUig umgdPNlkvF4TjcMCgo73qyUJYRjruiJrhIoI1h62xKakj9KKpspDMe9uIa3vKHcqnP3d x0eur1ZTYnC1xmtvCuacfH625Q37l5+E+nfYBie90Bgb2yozwVpFmsGHwIxycVZ+uO/7 zRKeD6aqCYx8mNHwSse+idhYc1ffjdE1zTgrUgBY3/a6hOeY59RoDIhE7ADIezTp349M aASw== X-Received: by 10.140.232.83 with SMTP id d80mr79936658qhc.15.1440583533571; Wed, 26 Aug 2015 03:05:33 -0700 (PDT) Received: from localhost (bne75-h02-31-39-163-232.dsl.sta.abo.bbox.fr. [31.39.163.232]) by smtp.gmail.com with ESMTPSA id p29sm7977220qkp.48.2015.08.26.03.05.32 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 26 Aug 2015 03:05:32 -0700 (PDT) From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Date: Wed, 26 Aug 2015 12:05:15 +0200 Message-Id: <1440583525-21632-3-git-send-email-marcandre.lureau@redhat.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1440583525-21632-1-git-send-email-marcandre.lureau@redhat.com> References: <1440583525-21632-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c04::229 Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , mdroth@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH v3 02/12] qga: use exit() when parsing options X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Marc-André Lureau The option parsing is going to be moved to a separate function, use exit() consistently. Signed-off-by: Marc-André Lureau Reviewed-by: Denis V. Lunev Reviewed-by: Eric Blake Reviewed-by: Michael Roth --- 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); } }