48 lines
1.8 KiB
Diff
48 lines
1.8 KiB
Diff
From b9212c3d72363f67d621dd4e16e507e4a677158e Mon Sep 17 00:00:00 2001
|
|
From: qihao <qihao_yewu@cmss.chinamobile.com>
|
|
Date: Tue, 27 Jun 2023 22:45:24 +0800
|
|
Subject: [PATCH] qga/vss-win32: fix warning for clang++-15
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
cheery-pick from a3f531cee66b12041098f7a809c2a7d6ecb6ad7d
|
|
|
|
Reported when compiling with clang-windows-arm64.
|
|
|
|
../qga/vss-win32/install.cpp:537:9: error: variable 'hr' is used uninitialized whenever 'if' condition is false [-Werror,-Wsometimes-uninitialized]
|
|
if (!(ControlService(service, SERVICE_CONTROL_STOP, NULL))) {
|
|
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
../qga/vss-win32/install.cpp:545:12: note: uninitialized use occurs here
|
|
return hr;
|
|
^~
|
|
|
|
Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
|
|
Fixes: 917ebcb170 ("qga-win: Fix QGA VSS Provider service stop failure")
|
|
Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>
|
|
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
|
|
Signed-off-by: Kostiantyn Kostiuk <kostyanf14@live.com>
|
|
(cherry picked from commit 0fcd574b025fccdf14d5140687cafe2bc30b634f)
|
|
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
|
|
Signed-off-by: qihao_yewu <qihao_yewu@cmss.chinamobile.com>
|
|
---
|
|
qga/vss-win32/install.cpp | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/qga/vss-win32/install.cpp b/qga/vss-win32/install.cpp
|
|
index 40de133774..e90a03c1cf 100644
|
|
--- a/qga/vss-win32/install.cpp
|
|
+++ b/qga/vss-win32/install.cpp
|
|
@@ -513,7 +513,7 @@ namespace _com_util
|
|
/* Stop QGA VSS provider service using Winsvc API */
|
|
STDAPI StopService(void)
|
|
{
|
|
- HRESULT hr;
|
|
+ HRESULT hr = S_OK;
|
|
SC_HANDLE manager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS);
|
|
SC_HANDLE service = NULL;
|
|
|
|
--
|
|
2.41.0.windows.1
|
|
|