On 10/07/2023 09.46, Konstantin Kostiuk wrote:
Signed-off-by: Konstantin Kostiuk <kkost...@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <phi...@linaro.org>
---
qga/vss-win32/install.cpp | 12 ++++++------
qga/vss-win32/requester.cpp | 9 +++++----
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/qga/vss-win32/install.cpp b/qga/vss-win32/install.cpp
index ff93b08a9e..9bd2c52b70 100644
--- a/qga/vss-win32/install.cpp
+++ b/qga/vss-win32/install.cpp
@@ -13,6 +13,7 @@
#include "qemu/osdep.h"
#include "vss-common.h"
+#include "vss-debug.h"
#ifdef HAVE_VSS_SDK
#include <vscoordint.h>
#else
@@ -54,7 +55,7 @@ void errmsg(DWORD err, const char *text)
FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
NULL, err, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
(char *)&msg, 0, NULL);
- fprintf(stderr, "%.*s. (Error: %lx) %s\n", len, text, err, msg);
+ qga_debug("%.*s. (Error: %lx) %s\n", len, text, err, msg);
Here you kept the "\n" at the end of the string...
LocalFree(msg);
}
@@ -219,7 +220,7 @@ static HRESULT QGAProviderRemove(ICatalogCollection *coll,
int i, void *arg)
{
HRESULT hr;
- fprintf(stderr, "Removing COM+ Application: %s\n", QGA_PROVIDER_NAME);
+ qga_debug("Removing COM+ Application: %s", QGA_PROVIDER_NAME);
chk(coll->Remove(i));
out:
return hr;
@@ -304,9 +305,8 @@ STDAPI COMRegister(void)
}
strcpy(tlbPath, dllPath);
strcpy(tlbPath+n-3, "tlb");
- fprintf(stderr, "Registering " QGA_PROVIDER_NAME ":\n");
- fprintf(stderr, " %s\n", dllPath);
- fprintf(stderr, " %s\n", tlbPath);
+ qga_debug("Registering " QGA_PROVIDER_NAME ": %s %s",
+ dllPath, tlbPath);
... but here you remove the "\n" ... looks weird. Looking at the first
patch, I assume the "\n" should now always be removed from the strings here?
Thomas