diff mbox series

[Openvpn-devel,2/3] Change C++ to C comments

Message ID 20181112122246.13556-2-simon@rozman.si
State Accepted
Headers
Series [Openvpn-devel,1/3] Delete TAP interface before the TAP driver is uninstalled |

Commit Message

Simon Rozman Nov. 12, 2018, 1:22 a.m. UTC 
  ---
 src/openvpnmsica/openvpnmsica.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

Comments

Gert Doering Jan. 17, 2019, 5:38 a.m. UTC | #1 
Acked-by: Gert Doering <gert@greenie.muc.de>

"Now that was an easy one" :-)

Your patch has been applied to the master branch.

commit 49cb9f9469e993abc13d317bdcd671822b47fab6
Author: Simon Rozman
Date:   Mon Nov 12 13:22:45 2018 +0100

     Change C++ to C comments

     Acked-by: Gert Doering <gert@greenie.muc.de>
     Message-Id: <20181112122246.13556-2-simon@rozman.si>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg17908.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering
diff mbox series

Patch

diff --git a/src/openvpnmsica/openvpnmsica.c b/src/openvpnmsica/openvpnmsica.c
index d1642d6a..99b47bf0 100644
--- a/src/openvpnmsica/openvpnmsica.c
+++ b/src/openvpnmsica/openvpnmsica.c
@@ -162,7 +162,7 @@  FindSystemInfo(_In_ MSIHANDLE hInstall)
     struct openvpnmsica_tls_data *s = (struct openvpnmsica_tls_data *)TlsGetValue(openvpnmsica_tlsidx_session);
     s->hInstall = hInstall;
 
-    // Get Windows version.
+    /* Get Windows version. */
     OSVERSIONINFOEX ver_info = { .dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX) };
     if (!GetVersionEx((LPOSVERSIONINFO)&ver_info)) {
         uiResult = GetLastError();
@@ -170,7 +170,7 @@  FindSystemInfo(_In_ MSIHANDLE hInstall)
         goto cleanup_CoInitialize;
     }
 
-    // The Windows version is usually spoofed, check using RtlGetVersion().
+    /* The Windows version is usually spoofed, check using RtlGetVersion(). */
     TCHAR szDllPath[0x1000];
     ExpandEnvironmentStrings(TEXT("%SystemRoot%\\System32\\ntdll.dll"), szDllPath,
 #ifdef UNICODE
@@ -193,7 +193,7 @@  FindSystemInfo(_In_ MSIHANDLE hInstall)
                     rtl_ver_info.dwMajorVersion == ver_info.dwMajorVersion && rtl_ver_info.dwMinorVersion >  ver_info.dwMinorVersion ||
                     rtl_ver_info.dwMajorVersion == ver_info.dwMajorVersion && rtl_ver_info.dwMinorVersion == ver_info.dwMinorVersion && rtl_ver_info.dwBuildNumber > ver_info.dwBuildNumber)
                 {
-                    // We got RtlGetVersion() and it reported newer version than GetVersionEx().
+                    /* We got RtlGetVersion() and it reported newer version than GetVersionEx(). */
                     ver_info.dwMajorVersion = rtl_ver_info.dwMajorVersion;
                     ver_info.dwMinorVersion = rtl_ver_info.dwMinorVersion;
                     ver_info.dwBuildNumber  = rtl_ver_info.dwBuildNumber;
@@ -204,7 +204,7 @@  FindSystemInfo(_In_ MSIHANDLE hInstall)
         FreeLibrary(hNtDllModule);
     }
 
-    // We don't trust RtlGetVersion() either. Check the version resource of kernel32.dll.
+    /* We don't trust RtlGetVersion() either. Check the version resource of kernel32.dll. */
     ExpandEnvironmentStrings(TEXT("%SystemRoot%\\System32\\kernel32.dll"), szDllPath,
 #ifdef UNICODE
         _countof(szDllPath)
@@ -220,10 +220,10 @@  FindSystemInfo(_In_ MSIHANDLE hInstall)
         LPVOID pVersionInfo = malloc(dwVerInfoSize);
         if (pVersionInfo)
         {
-            // Read version info.
+            /* Read version info. */
             if (GetFileVersionInfo(szDllPath, dwHandle, dwVerInfoSize, pVersionInfo))
             {
-                // Get the value for the root block.
+                /* Get the value for the root block. */
                 UINT uiSize = 0;
                 VS_FIXEDFILEINFO *pVSFixedFileInfo = NULL;
                 if (VerQueryValue(pVersionInfo, TEXT("\\"), &pVSFixedFileInfo, &uiSize) && uiSize && pVSFixedFileInfo)
@@ -231,7 +231,7 @@  FindSystemInfo(_In_ MSIHANDLE hInstall)
                         HIWORD(pVSFixedFileInfo->dwProductVersionMS) == ver_info.dwMajorVersion && LOWORD(pVSFixedFileInfo->dwProductVersionMS) >  ver_info.dwMinorVersion ||
                         HIWORD(pVSFixedFileInfo->dwProductVersionMS) == ver_info.dwMajorVersion && LOWORD(pVSFixedFileInfo->dwProductVersionMS) == ver_info.dwMinorVersion && HIWORD(pVSFixedFileInfo->dwProductVersionLS) > ver_info.dwBuildNumber)
                     {
-                        // We got kernel32.dll version and it is newer.
+                        /* We got kernel32.dll version and it is newer. */
                         ver_info.dwMajorVersion = HIWORD(pVSFixedFileInfo->dwProductVersionMS);
                         ver_info.dwMinorVersion = LOWORD(pVSFixedFileInfo->dwProductVersionMS);
                         ver_info.dwBuildNumber  = HIWORD(pVSFixedFileInfo->dwProductVersionLS);