Changeset 49039 in vbox for trunk/src/VBox/Additions/common/VBoxService

Timestamp:

Oct 10, 2013 6:27:32 PM (11 years ago)

Author:

vboxsync

Message:

IPRT: Filename extension versus suffix cleanup, long overdue.

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlSession.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlSession.cpp

@@ -1742 +1742 @@
                     if (pszLogFile)
                     {
-                        char *pszLogExt = NULL;
-                        if (RTPathHasExt(pszLogFile))
-                            pszLogExt = RTStrDup(RTPathExt(pszLogFile));
-                        RTPathStripExt(pszLogFile);
-                        char *pszLogSuffix;
+                        char *pszLogSuff = NULL;
+                        if (RTPathHasSuffix(pszLogFile))
+                            pszLogSuff = RTStrDup(RTPathSuffix(pszLogFile));
+                        RTPathStripSuffix(pszLogFile);
+                        char *pszLogNewSuffix;
 #ifndef DEBUG
-                        if (RTStrAPrintf(&pszLogSuffix, "-%RU32-%s",
+                        if (RTStrAPrintf(&pszLogNewSuffix, "-%RU32-%s",
                                          pSessionStartupInfo->uSessionID,
                                          pSessionStartupInfo->szUser) < 0)
@@ -1755 +1755 @@
                         }
 #else
-                        if (RTStrAPrintf(&pszLogSuffix, "-%RU32-%RU32-%s",
+                        if (RTStrAPrintf(&pszLogNewSuffix, "-%RU32-%RU32-%s",
                                          pSessionStartupInfo->uSessionID,
                                          s_uCtrlSessionThread,
@@ -1765 +1765 @@
                         else
                         {
-                            rc2 = RTStrAAppend(&pszLogFile, pszLogSuffix);
-                            if (RT_SUCCESS(rc2) && pszLogExt)
-                                rc2 = RTStrAAppend(&pszLogFile, pszLogExt);
+                            rc2 = RTStrAAppend(&pszLogFile, pszLogNewSuffix);
+                            if (RT_SUCCESS(rc2) && pszLogSuff)
+                                rc2 = RTStrAAppend(&pszLogFile, pszLogSuff);
                             if (RT_SUCCESS(rc2))
                             {
@@ -1776 +1776 @@
                                 }
                             }
-                            RTStrFree(pszLogSuffix);
+                            RTStrFree(pszLogNewSuffix);
                         }
                         if (RT_FAILURE(rc2))
                             VBoxServiceError("Error building session logfile string for session %RU32 (user %s), rc=%Rrc\n",
                                              pSessionStartupInfo->uSessionID, pSessionStartupInfo->szUser, rc2);
-                        if (pszLogExt)
-                            RTStrFree(pszLogExt);
+                        if (pszLogSuff)
+                            RTStrFree(pszLogSuff);
                         RTStrFree(pszLogFile);
                     }