Changeset 69743 in vbox for trunk/src/VBox/Main

Timestamp:

Nov 18, 2017 5:09:04 AM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

119143

Message:

svcnmain.cpp: log name nits

File:

• trunk/src/VBox/Main/src-server/win/svcmain.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-server/win/svcmain.cpp

@@ -797 +797 @@
         /** @todo Merge this code with server.cpp (use Logging.cpp?). */
         char szLogFile[RTPATH_MAX];
-        if (!pszLogFile)
+        if (!pszLogFile || !*pszLogFile)
         {
             vrc = com::GetVBoxUserHomeDirectory(szLogFile, sizeof(szLogFile));
             if (RT_SUCCESS(vrc))
                 vrc = RTPathAppend(szLogFile, sizeof(szLogFile), "VBoxSVC.log");
-        }
-        else
-        {
-            if (!RTStrPrintf(szLogFile, sizeof(szLogFile), "%s", pszLogFile))
-                vrc = VERR_NO_MEMORY;
-        }
-        if (RT_FAILURE(vrc))
-            return RTMsgErrorExit(RTEXITCODE_FAILURE, "failed to create logging file name, rc=%Rrc", vrc);
+            if (RT_FAILURE(vrc))
+                return RTMsgErrorExit(RTEXITCODE_FAILURE, "failed to construct release log filename, rc=%Rrc", vrc);
+            pszLogFile = szLogFile;
+        }
 
         char szError[RTPATH_MAX + 128];
-        vrc = com::VBoxLogRelCreate("COM Server", szLogFile,
+        vrc = com::VBoxLogRelCreate("COM Server", pszLogFile,
                                     RTLOGFLAGS_PREFIX_THREAD | RTLOGFLAGS_PREFIX_TIME_PROG,
                                     VBOXSVC_LOG_DEFAULT, "VBOXSVC_RELEASE_LOG",