[XS] Change in openvpn[master]: Fix some msg() calls with wrong number of arguments in Windows-only code

cron2 has uploaded a new patch set (#2) to the change originally created by flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/1672?usp=email )

The following approvals got outdated and were removed:
Code-Review+2 by cron2


Change subject: Fix some msg() calls with wrong number of arguments in Windows-only code
......................................................................

Fix some msg() calls with wrong number of arguments in Windows-only code

For some reason neither MSVC nor MinGW complained?
cppcheck did (once told that msg is a printf-style
function).

Change-Id: Ia688ec12e642de699811ced8668b40be9fbb6155
Signed-off-by: Frank Lichtenheld <[email protected]>
Acked-by: Gert Doering <[email protected]>
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1672
Message-Id: <[email protected]>
URL: https://www.mail-archive.com/[email protected]/msg36862.html
Signed-off-by: Gert Doering <[email protected]>
---
M src/openvpnmsica/msiex.c
M src/tapctl/tap.c
2 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/72/1672/2

diff --git a/src/openvpnmsica/msiex.c b/src/openvpnmsica/msiex.c
index f8bf6ae..4d48f06 100644
--- a/src/openvpnmsica/msiex.c
+++ b/src/openvpnmsica/msiex.c
@@ -51,7 +51,7 @@
         *pszValue = (LPWSTR)malloc(++dwLength * sizeof(WCHAR));
         if (*pszValue == NULL)
         {
-            msg(M_FATAL, "%s: malloc(%u) failed", dwLength * sizeof(WCHAR));
+            msg(M_FATAL, "%s: malloc(%u) failed", __FUNCTION__, dwLength * sizeof(WCHAR));
             return ERROR_OUTOFMEMORY;
         }
 
diff --git a/src/tapctl/tap.c b/src/tapctl/tap.c
index 16e3c0b..1d94988 100644
--- a/src/tapctl/tap.c
+++ b/src/tapctl/tap.c
@@ -487,8 +487,8 @@
         }
 
         default:
-            msg(M_NONFATAL, "%s: \"%ls\" registry value is not string (type %u)", __FUNCTION__,
-                dwValueType);
+            msg(M_NONFATAL, "%s: \"%ls\" registry value is not string (type %u)",
+                __FUNCTION__, szName, dwValueType);
             return ERROR_UNSUPPORTED_TYPE;
     }
 }

-- 
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1672?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email

Gerrit-MessageType: newpatchset
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ia688ec12e642de699811ced8668b40be9fbb6155
Gerrit-Change-Number: 1672
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <[email protected]>
Gerrit-Reviewer: cron2 <[email protected]>
Gerrit-Reviewer: plaisthos <[email protected]>
Gerrit-CC: openvpn-devel <[email protected]>

_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel