From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45424) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2SI6-0003a7-GG for qemu-devel@nongnu.org; Thu, 25 Jul 2013 16:37:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V2SI5-0004s3-52 for qemu-devel@nongnu.org; Thu, 25 Jul 2013 16:37:38 -0400 Sender: fluxion From: Michael Roth Date: Thu, 25 Jul 2013 15:37:23 -0500 Message-Id: <1374784644-29078-3-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1374784644-29078-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1374784644-29078-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 2/3] ga_install_service(): nest error paths more idiomatically List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pmatouse@redhat.com, aliguori@us.ibm.com, lersek@redhat.com, qemu-stable@nongnu.org, lveyde@redhat.com From: Laszlo Ersek Acked-by: Michael Roth Reviewed-by: Eric Blake Signed-off-by: Laszlo Ersek Signed-off-by: Michael Roth --- qga/service-win32.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/qga/service-win32.c b/qga/service-win32.c index 6de8be4..1cf81fc 100644 --- a/qga/service-win32.c +++ b/qga/service-win32.c @@ -38,10 +38,12 @@ static int printf_win_error(const char *text) int ga_install_service(const char *path, const char *logfile, const char *state_dir) { + int ret = EXIT_FAILURE; SC_HANDLE manager; SC_HANDLE service; TCHAR module_fname[MAX_PATH]; GString *cmdline; + SERVICE_DESCRIPTION desc = { (char *)QGA_SERVICE_DESCRIPTION }; if (GetModuleFileName(NULL, module_fname, MAX_PATH) == 0) { printf_win_error("No full path to service's executable"); @@ -66,28 +68,28 @@ int ga_install_service(const char *path, const char *logfile, manager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); if (manager == NULL) { printf_win_error("No handle to service control manager"); - g_string_free(cmdline, TRUE); - return EXIT_FAILURE; + goto out_strings; } service = CreateService(manager, QGA_SERVICE_NAME, QGA_SERVICE_DISPLAY_NAME, SERVICE_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, SERVICE_ERROR_NORMAL, cmdline->str, NULL, NULL, NULL, NULL, NULL); - - if (service) { - SERVICE_DESCRIPTION desc = { (char *)QGA_SERVICE_DESCRIPTION }; - ChangeServiceConfig2(service, SERVICE_CONFIG_DESCRIPTION, &desc); - - fprintf(stderr, "Service was installed successfully.\n"); - } else { + if (service == NULL) { printf_win_error("Failed to install service"); + goto out_manager; } + ChangeServiceConfig2(service, SERVICE_CONFIG_DESCRIPTION, &desc); + fprintf(stderr, "Service was installed successfully.\n"); + ret = EXIT_SUCCESS; CloseServiceHandle(service); + +out_manager: CloseServiceHandle(manager); +out_strings: g_string_free(cmdline, TRUE); - return (service == NULL); + return ret; } int ga_uninstall_service(void) -- 1.7.9.5