From nobody Mon Feb 9 08:56:06 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1499241490157297.7000252325711; Wed, 5 Jul 2017 00:58:10 -0700 (PDT) Received: from localhost ([::1]:44700 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dSfCK-0007XY-V5 for importer@patchew.org; Wed, 05 Jul 2017 03:58:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57041) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dSf8l-0004YO-Qy for qemu-devel@nongnu.org; Wed, 05 Jul 2017 03:54:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dSf8l-0006wK-07 for qemu-devel@nongnu.org; Wed, 05 Jul 2017 03:54:27 -0400 Received: from mail-wr0-x244.google.com ([2a00:1450:400c:c0c::244]:34431) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dSf8k-0006vp-QR for qemu-devel@nongnu.org; Wed, 05 Jul 2017 03:54:26 -0400 Received: by mail-wr0-x244.google.com with SMTP id k67so49070999wrc.1 for ; Wed, 05 Jul 2017 00:54:26 -0700 (PDT) Received: from bark.daynix ([141.226.163.173]) by smtp.gmail.com with ESMTPSA id 22sm29144444wru.29.2017.07.05.00.54.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Jul 2017 00:54:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references:list-id; bh=hHxC/ezqq+kdKWe+oyYFiPJkn/cjWGUrAmaw3PdyVMc=; b=e5zxpC/of5EQDLtzzCy0IotQu0fpPwVfDUytgrkrH80wPexPSb3AbxTcAsD/krAjpU VSpx6avD0fnHcWJIahNCSUNztwUFm3xEPELfSM3T5mV1qmztjylvc324BF5E1UUcSI79 POwNYMyPaxR58doeb8k+pmayRUujMRM8dOvyx7cq/UhWOvUYg0l0InEv0ajt2tWwShy1 QtT7GTcUeznDjWnxrRiQ8Mma3WyH6dtrHo+Osb441hClWzb7M7/ul+t4R0K/FKPopKgX nWbSGlo3tgx4yrMtKCyYZ/pGO6zwMH23C/ZZLOHuehdofE5fVFz7B8hczGoLit3RE1z6 YXlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:list-id; bh=hHxC/ezqq+kdKWe+oyYFiPJkn/cjWGUrAmaw3PdyVMc=; b=dw78RzQwfXpUP1s1/9iy5rxev2NgI+BpMbwXVhYP/mIDuCpyTUV906VU/18zz9eagJ SEjexr6igcN1c+GNQkcdLEz6QtTjqYcAMOai52M45Krtte/bn+rJO0r+FC2GenbJ95S9 j2pFrIwXha5kxNIfBBhlmgN3Q9hiSlasQT/ErDp3MvIM5zo08tMUX09eNX/xHbeW+Bd6 BSbydHI5E4WRTtGFaPSkx06NOPOcp/y/Y38tbNRDCcLwIT04KEA2IyJqKK2yObOrZaU8 5Iy3F7RgLj4s0G27lhdvwuL5oed4I7wrkR/3frxQ1yMx+NMvSh60LzUaS6a+cJhYfvQF ZbOA== X-Gm-Message-State: AKS2vOzvznM2fhiUPoNzfdRJTlRhRJoZCUweEwMBd70bW7Wt9sKo2muc TeHD/I4fKZYu64kzgj0= X-Received: by 10.223.139.24 with SMTP id n24mr40695700wra.116.1499241265501; Wed, 05 Jul 2017 00:54:25 -0700 (PDT) From: Sameeh Jubran To: qemu-devel@nongnu.org, Michael Roth Date: Wed, 5 Jul 2017 10:54:11 +0300 Message-Id: <20170705075411.6556-6-sameeh@daynix.com> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170705075411.6556-1-sameeh@daynix.com> References: <20170705075411.6556-1-sameeh@daynix.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::244 Subject: [Qemu-devel] [PATCH 5/5] qga-win: service-win32: Use get_service function X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yan Vugenfirer Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Sameeh Jubran Signed-off-by: Sameeh Jubran --- qga/service-win32.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/qga/service-win32.c b/qga/service-win32.c index 861f9fc..c17e0eb 100644 --- a/qga/service-win32.c +++ b/qga/service-win32.c @@ -198,20 +198,12 @@ int ga_install_service(const char *path, const char *= logfile, =20 static int uninstall_service(LPCTSTR service_name) { - SC_HANDLE manager; - SC_HANDLE service; - - manager =3D OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); - if (manager =3D=3D NULL) { - printf_win_error("No handle to service control manager"); - return EXIT_FAILURE; - } + int ret =3D EXIT_FAILURE; + SC_HANDLE service =3D NULL; + ret =3D get_service(service_name, &service); =20 - service =3D OpenService(manager, service_name, DELETE); - if (service =3D=3D NULL) { - printf_win_error("No handle to service"); - CloseServiceHandle(manager); - return EXIT_FAILURE; + if (ret !=3D EXIT_SUCCESS) { + return ret; } =20 if (DeleteService(service) =3D=3D FALSE) { @@ -221,7 +213,6 @@ static int uninstall_service(LPCTSTR service_name) } =20 CloseServiceHandle(service); - CloseServiceHandle(manager); =20 return EXIT_SUCCESS; } --=20 2.9.4