Changeset 103275 in vbox

Timestamp:

Feb 8, 2024 11:56:18 AM (14 months ago)

Author:

vboxsync

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

161567

Message:

Backed out r161549 again (not wanted / bloat).

Location:

trunk/src

Files:

• VBox/Debugger/DBGPlugInDarwin.cpp (modified) (1 diff)
• VBox/Devices/Audio/DrvAudio.cpp (modified) (1 diff)
• VBox/Devices/Network/testcase/tstIntNet-1.cpp (modified) (1 diff)
• VBox/HostDrivers/Support/testcase/tstInt.cpp (modified) (3 diffs)
• VBox/HostServices/SharedFolders/testcase/tstShflCase.cpp (modified) (14 diffs)
• VBox/Main/src-server/linux/PerformanceLinux.cpp (modified) (1 diff)
• VBox/Main/src-server/xpcom/server_module.cpp (modified) (8 diffs)
• VBox/Runtime/common/dbg/dbgmod.cpp (modified) (1 diff)
• VBox/Runtime/r3/xml.cpp (modified) (1 diff)
• VBox/Runtime/testcase/tstRTR0CommonDriver.h (modified) (2 diffs)
• VBox/VMM/VMMR3/DBGFR3PlugIn.cpp (modified) (2 diffs)
• VBox/ValidationKit/utils/fs/FsPerf.cpp (modified) (4 diffs)
• VBox/ValidationKit/utils/misc/loadgenerator.cpp (modified) (1 diff)
• bldprogs/VBoxTpG.cpp (modified) (1 diff)

trunk/src/VBox/Debugger/DBGPlugInDarwin.cpp

@@ -716 +716 @@
             {
                 char szTmp[RTDBG_SEGMENT_NAME_LENGTH + sizeof("_start")];
-                rc = RTStrCat(RTStrCopy2(szTmp, sizeof(szTmp), aSegs[iSeg].szName), sizeof(szTmp), "_start");
-                if (RT_SUCCESS(rc))
-                    rc = RTDbgModSymbolAdd(hMod, szTmp, iSeg, 0 /*uRva*/, 0 /*cb*/, 0 /*fFlags*/, NULL);
+                strcat(strcpy(szTmp, aSegs[iSeg].szName), "_start");
+                rc = RTDbgModSymbolAdd(hMod, szTmp, iSeg, 0 /*uRva*/, 0 /*cb*/, 0 /*fFlags*/, NULL);
             }
             uRvaNext += aSegs[iSeg].cb;

trunk/src/VBox/Devices/Audio/DrvAudio.cpp

@@ -4842 +4842 @@
 #define QUERY_VAL_RET(a_Width, a_szName, a_pValue, a_uDefault, a_ExprValid, a_szValidRange) \
             do { \
-                rc = RTStrCopy(szNm, sizeof(szNm), a_szName); \
-                AssertRCReturn(rc, PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS, \
-                                                       N_("Configuration error: Name '%s' too long [1]"), szNm)); \
-                rc = RT_CONCAT(pHlp->pfnCFGMQueryU,a_Width)(pDirNode, szNm, a_pValue); \
+                rc = RT_CONCAT(pHlp->pfnCFGMQueryU,a_Width)(pDirNode, strcpy(szNm, a_szName), a_pValue); \
                 if (rc == VERR_CFGM_VALUE_NOT_FOUND || rc == VERR_CFGM_NO_PARENT) \
                 { \
-                    rc = RTStrCat(szNm, sizeof(szNm), pszDir); \
-                    AssertRCReturn(rc, PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS, \
-                                                           N_("Configuration error: Name '%s' too long [2]"), pszDir)); \
-                    rc = RT_CONCAT(pHlp->pfnCFGMQueryU,a_Width)(pCfg, szNm, a_pValue); \
+                    rc = RT_CONCAT(pHlp->pfnCFGMQueryU,a_Width)(pCfg, strcat(szNm, pszDir), a_pValue); \
                     if (rc == VERR_CFGM_VALUE_NOT_FOUND || rc == VERR_CFGM_NO_PARENT) \
                     { \

trunk/src/VBox/Devices/Network/testcase/tstIntNet-1.cpp

@@ -847 +847 @@
     }
 
-    rc = RTStrCat(szPath, sizeof(szPath), "/../VMMR0.r0");
-    if (RT_FAILURE(rc))
-    {
-        RTPrintf("tstIntNet-1: RTStrCat -> %Rrc\n", rc);
-        return 1;
-    }
+    strcat(szPath, "/../VMMR0.r0");
 
     char szAbsPath[RTPATH_MAX];

trunk/src/VBox/HostDrivers/Support/testcase/tstInt.cpp

@@ -62 +62 @@
     int rcRet = 0;
     int i;
+    int rc;
     int cIterations = argc > 1 ? RTStrToUInt32(argv[1]) : 32;
     if (cIterations == 0)
@@ -71 +72 @@
     RTR3InitExe(argc, &argv, 0);
     PSUPDRVSESSION pSession;
-    int rc = SUPR3Init(&pSession);
+    rc = SUPR3Init(&pSession);
     rcRet += rc != 0;
     RTPrintf("tstInt: SUPR3Init -> rc=%Rrc\n", rc);
     char szFile[RTPATH_MAX];
-    if (RT_SUCCESS(rc))
-        rc = RTPathExecDir(szFile, sizeof(szFile));
-
+    if (!rc)
+    {
+        rc = RTPathExecDir(szFile, sizeof(szFile) - sizeof("/VMMR0.r0"));
+    }
     char szAbsFile[RTPATH_MAX];
     if (RT_SUCCESS(rc))
     {
-        rc = RTPathAppend(szFile, sizeof(szFile), "VMMR0.r0");
-        if (RT_SUCCESS(rc))
-            rc = RTPathAbs(szFile, szAbsFile, sizeof(szAbsFile));
+        strcat(szFile, "/VMMR0.r0");
+        rc = RTPathAbs(szFile, szAbsFile, sizeof(szAbsFile));
     }
     if (RT_SUCCESS(rc))
@@ -235 +236 @@
     }
 
-    if (RT_FAILURE(rc))
-        RTPrintf("Failed with rc=%Rrc\n", rc);
-
     return !!rc;
 }

trunk/src/VBox/HostServices/SharedFolders/testcase/tstShflCase.cpp

@@ -1 +1 @@
 /** @file
  * Testcase for shared folder case conversion code.
- *
- * @todo r=andy Testcase needs to be rewritten using the test framework.
- *              Otherwise it's almost pointless to run this on the testboxes.
  */
 
@@ -45 +42 @@
 #include <iprt/path.h>
 #include <iprt/string.h>
-#include <iprt/test.h>
 #include <iprt/uni.h>
 #include <stdio.h>
@@ -209 +205 @@
 }
 
-static int vbsfCorrectCasing(char *pszFullPath, char *pszStartComponent, size_t cbStartComponent)
+static int vbsfCorrectCasing(char *pszFullPath, char *pszStartComponent)
 {
     PRTDIRENTRYEX  pDirEntry = NULL;
@@ -234 +230 @@
     Assert(*(pszStartComponent-1) == RTPATH_DELIMITER);
     *(pszStartComponent-1) = 0;
-    rc = RTStrCopy(pDirEntry->szName, sizeof(pDirEntry->szName), pszFullPath);
-    if (RT_FAILURE(rc))
-        goto end;
+    strcpy(pDirEntry->szName, pszFullPath);
     szWildCard[0] = RTPATH_DELIMITER;
     szWildCard[1] = '*';
     szWildCard[2] = 0;
-    rc = RTStrCat(pDirEntry->szName, sizeof(pDirEntry->szName), szWildCard);
-    if (RT_FAILURE(rc))
-        goto end;
+    strcat(pDirEntry->szName, szWildCard);
+
     rc = RTDirOpenFiltered(&hSearch, pDirEntry->szName, RTDIRFILTER_WINNT, 0 /*fFlags*/);
     *(pszStartComponent-1) = RTPATH_DELIMITER;
@@ -270 +263 @@
         {
             Log(("Found original name %s (%s)\n", &pDirEntry->szName[0], pszStartComponent));
-            rc = RTStrCopy(pszStartComponent, cbStartComponent, &pDirEntry->szName[0]);
+            strcpy(pszStartComponent, &pDirEntry->szName[0]);
+            rc = VINF_SUCCESS;
             break;
         }
@@ -288 +282 @@
 
 
-static int testCase(char *pszFullPath, size_t cbFullPath, bool fWildCard = false)
+static int testCase(char *pszFullPath, bool fWildCard = false)
 {
     int rc;
@@ -297 +291 @@
     {
         /* strip off the last path component, that contains the wildcard(s) */
-        size_t cchLlen = strlen(pszFullPath);
-        char  *pszSrc  = pszFullPath + cchLlen - 1;
-
-        while(pszSrc > pszFullPath)
-        {
-            if (*pszSrc == RTPATH_DELIMITER)
+        size_t   len = strlen(pszFullPath);
+        char    *src = pszFullPath + len - 1;
+
+        while(src > pszFullPath)
+        {
+            if (*src == RTPATH_DELIMITER)
                 break;
-            pszSrc--;
-        }
-        if (*pszSrc == RTPATH_DELIMITER)
+            src--;
+        }
+        if (*src == RTPATH_DELIMITER)
         {
             bool fHaveWildcards = false;
-            char *temp = pszSrc;
+            char *temp = src;
 
             while(*temp)
@@ -325 +319 @@
             if (fHaveWildcards)
             {
-                pszWildCardComponent = pszSrc;
+                pszWildCardComponent = src;
                 *pszWildCardComponent = 0;
             }
@@ -334 +328 @@
     if (rc == VERR_FILE_NOT_FOUND || rc == VERR_PATH_NOT_FOUND)
     {
-        size_t cchLen = strlen(pszFullPath);
-        char  *pszSrc = pszFullPath + cchLen - 1;
+        size_t   len = strlen(pszFullPath);
+        char    *src = pszFullPath + len - 1;
 
         Log(("Handle case insensitive guest fs on top of host case sensitive fs for %s\n", pszFullPath));
 
         /* Find partial path that's valid */
-        while(pszSrc > pszFullPath)
-        {
-            if (*pszSrc == RTPATH_DELIMITER)
+        while(src > pszFullPath)
+        {
+            if (*src == RTPATH_DELIMITER)
             {
-                *pszSrc = 0;
+                *src = 0;
                 rc = RTPathQueryInfo (pszFullPath, &info, RTFSOBJATTRADD_NOTHING);
-                *pszSrc = RTPATH_DELIMITER;
+                *src = RTPATH_DELIMITER;
                 if (rc == VINF_SUCCESS)
                 {
 #ifdef DEBUG
-                    *pszSrc = 0;
+                    *src = 0;
                     Log(("Found valid partial path %s\n", pszFullPath));
-                    *pszSrc = RTPATH_DELIMITER;
+                    *src = RTPATH_DELIMITER;
 #endif
                     break;
@@ -358 +352 @@
             }
 
-            pszSrc--;
-        }
-        Assert(*pszSrc == RTPATH_DELIMITER && RT_SUCCESS(rc));
-        if (    *pszSrc == RTPATH_DELIMITER
+            src--;
+        }
+        Assert(*src == RTPATH_DELIMITER && RT_SUCCESS(rc));
+        if (    *src == RTPATH_DELIMITER
             &&  RT_SUCCESS(rc))
         {
-            pszSrc++;
+            src++;
             for(;;)
             {
-                char *end = pszSrc;
+                char *end = src;
                 bool fEndOfString = true;
 
@@ -381 +375 @@
                     fEndOfString = false;
                     *end = 0;
-                    rc = RTPathQueryInfo(pszSrc, &info, RTFSOBJATTRADD_NOTHING);
+                    rc = RTPathQueryInfo(src, &info, RTFSOBJATTRADD_NOTHING);
                     Assert(rc == VINF_SUCCESS || rc == VERR_FILE_NOT_FOUND || rc == VERR_PATH_NOT_FOUND);
                 }
                 else
-                if (end == pszSrc)
+                if (end == src)
                     rc = VINF_SUCCESS;  /* trailing delimiter */
                 else
@@ -393 +387 @@
                 {
                     /* path component is invalid; try to correct the casing */
-                    rc = vbsfCorrectCasing(pszFullPath, pszSrc, cbFullPath - (pszFullPath - pszSrc));
+                    rc = vbsfCorrectCasing(pszFullPath, src);
                     if (RT_FAILURE(rc))
                     {
@@ -406 +400 @@
 
                 *end = RTPATH_DELIMITER;
-                pszSrc = end + 1;
+                src = end + 1;
             }
             if (RT_FAILURE(rc))
@@ -436 +430 @@
     RTLogFlags(NULL, "unbuffered");
 
-    RTTESTI_CHECK_RC_OK(RTStrCopy(szTest, sizeof(szTest), "c:\\test Dir\\z.bAt"));
-    testCase(szTest, sizeof(szTest));
-    RTTESTI_CHECK_RC_OK(RTStrCopy(szTest, sizeof(szTest), "c:\\test dir\\z.bAt"));
-    testCase(szTest, sizeof(szTest));
-    RTTESTI_CHECK_RC_OK(RTStrCopy(szTest, sizeof(szTest), "c:\\test dir\\SUBDIR\\z.bAt"));
-    testCase(szTest, sizeof(szTest));
-    RTTESTI_CHECK_RC_OK(RTStrCopy(szTest, sizeof(szTest), "c:\\test dir\\SUBDiR\\atestje.bat"));
-    testCase(szTest, sizeof(szTest));
-    RTTESTI_CHECK_RC_OK(RTStrCopy(szTest, sizeof(szTest), "c:\\TEST dir\\subDiR\\aTestje.baT"));
-    testCase(szTest, sizeof(szTest));
-    RTTESTI_CHECK_RC_OK(RTStrCopy(szTest, sizeof(szTest), "c:\\TEST dir\\subDiR\\*"));
-    testCase(szTest, sizeof(szTest), true);
-    RTTESTI_CHECK_RC_OK(RTStrCopy(szTest, sizeof(szTest), "c:\\TEST dir\\subDiR\\"));
-    testCase(szTest ,sizeof(szTest), true);
-    RTTESTI_CHECK_RC_OK(RTStrCopy(szTest, sizeof(szTest), "c:\\test dir\\SUBDIR\\"));
-    testCase(szTest, sizeof(szTest));
-    RTTESTI_CHECK_RC_OK(RTStrCopy(szTest, sizeof(szTest), "c:\\test dir\\invalid\\SUBDIR\\test.bat"));
-    testCase(szTest, sizeof(szTest));
+    strcpy(szTest, "c:\\test Dir\\z.bAt");
+    testCase(szTest);
+    strcpy(szTest, "c:\\test dir\\z.bAt");
+    testCase(szTest);
+    strcpy(szTest, "c:\\test dir\\SUBDIR\\z.bAt");
+    testCase(szTest);
+    strcpy(szTest, "c:\\test dir\\SUBDiR\\atestje.bat");
+    testCase(szTest);
+    strcpy(szTest, "c:\\TEST dir\\subDiR\\aTestje.baT");
+    testCase(szTest);
+    strcpy(szTest, "c:\\TEST dir\\subDiR\\*");
+    testCase(szTest, true);
+    strcpy(szTest, "c:\\TEST dir\\subDiR\\");
+    testCase(szTest ,true);
+    strcpy(szTest, "c:\\test dir\\SUBDIR\\");
+    testCase(szTest);
+    strcpy(szTest, "c:\\test dir\\invalid\\SUBDIR\\test.bat");
+    testCase(szTest);
     return 0;
 }

trunk/src/VBox/Main/src-server/linux/PerformanceLinux.cpp

@@ -531 +531 @@
         return;
     }
-    vrc = RTStrCat(szVolInfo, sizeof(szVolInfo), "/" VBOXVOLINFO_NAME " ");
-    AssertRCReturnVoid(vrc);
-    vrc = RTStrCat(szVolInfo, sizeof(szVolInfo), pcszVolume);
-    AssertRCReturnVoid(vrc);
+    strcat(szVolInfo, "/" VBOXVOLINFO_NAME " ");
+    strcat(szVolInfo, pcszVolume);
 
     FILE *fp = popen(szVolInfo, "r");

trunk/src/VBox/Main/src-server/xpcom/server_module.cpp

@@ -75 +75 @@
 
 /** Name of the server executable. */
-const char g_szVBoxSVC_exe[] = RTPATH_SLASH_STR "VBoxSVC" HOSTSUFF_EXE;
+const char VBoxSVC_exe[] = RTPATH_SLASH_STR "VBoxSVC" HOSTSUFF_EXE;
 
 enum
@@ -88 +88 @@
  *  Full path to the VBoxSVC executable.
  */
-static char g_szVBoxSVCPath[RTPATH_MAX];
-static bool g_fIsVBoxSVCPathSet = false;
+static char VBoxSVCPath[RTPATH_MAX];
+static bool IsVBoxSVCPathSet = false;
 
 /*
@@ -116 +116 @@
         const char *apszArgs[] =
         {
-            g_szVBoxSVCPath,
+            VBoxSVCPath,
             "--auto-shutdown",
             "--inherit-startup-pipe",
@@ -132 +132 @@
         hStdNil.u.hFile = NIL_RTFILE;
 
-        vrc = RTProcCreateEx(g_szVBoxSVCPath, apszArgs, RTENV_DEFAULT,
+        vrc = RTProcCreateEx(VBoxSVCPath, apszArgs, RTENV_DEFAULT,
                              RTPROC_FLAGS_DETACHED, &hStdNil, &hStdNil, &hStdNil,
                              NULL /* pszAsUser */, NULL /* pszPassword */, NULL /* pExtraData */,
@@ -187 +187 @@
         }
 
-        if (!g_fIsVBoxSVCPathSet)
+        if (!IsVBoxSVCPathSet)
         {
             /* Get the directory containing XPCOM components -- the VBoxSVC
@@ -204 +204 @@
 
                     LogFlowFunc(("component directory = \"%s\"\n", path.get()));
-                    AssertBreakStmt(path.Length() + strlen(g_szVBoxSVC_exe) < RTPATH_MAX,
+                    AssertBreakStmt(path.Length() + strlen(VBoxSVC_exe) < RTPATH_MAX,
                                     rc = NS_ERROR_FAILURE);
 
@@ -212 +212 @@
                     if (cbKernArch > 0)
                     {
-                        sprintf(g_szVBoxSVCPath, "/opt/VirtualBox/%s%s", achKernArch, g_szVBoxSVC_exe);
-                        g_fIsVBoxSVCPathSet = true;
+                        sprintf(VBoxSVCPath, "/opt/VirtualBox/%s%s", achKernArch, VBoxSVC_exe);
+                        IsVBoxSVCPathSet = true;
                     }
                     else
                         rc = NS_ERROR_UNEXPECTED;
 #else
-                    int vrc = RTStrCopy(g_szVBoxSVCPath, sizeof(g_szVBoxSVCPath), path.get());
-                    AssertRCBreakStmt(vrc, rc = NS_ERROR_FAILURE);
-                    RTPathStripFilename(g_szVBoxSVCPath);
-                    vrc = RTStrCat(g_szVBoxSVCPath, sizeof(g_szVBoxSVCPath), g_szVBoxSVC_exe);
-                    AssertRCBreakStmt(vrc, rc = NS_ERROR_FAILURE);
-
-                    g_fIsVBoxSVCPathSet = true;
+                    strcpy(VBoxSVCPath, path.get());
+                    RTPathStripFilename(VBoxSVCPath);
+                    strcat(VBoxSVCPath, VBoxSVC_exe);
+
+                    IsVBoxSVCPathSet = true;
 #endif
                 }
@@ -249 +247 @@
             if (NS_FAILED(rc))
             {
-                LogFlowFunc(("Starting server \"%s\"...\n", g_szVBoxSVCPath));
+                LogFlowFunc(("Starting server \"%s\"...\n", VBoxSVCPath));
 
                 startedOnce = true;

trunk/src/VBox/Runtime/common/dbg/dbgmod.cpp

@@ -610 +610 @@
             if (pszName)
             {
-                size_t const cchName       = strlen(pszName);
-                size_t const cchExtFileBuf = cchName + strlen(pszExt) + 1;
-
-                char *pszExtFileBuf = (char *)alloca(cchExtFileBuf);
-                AssertPtrReturn(pszExtFileBuf, VERR_NO_MEMORY);
-
-                memcpy(pszExtFileBuf, pszName, cchName + 1);
-                RTPathStripSuffix(pszExtFileBuf);
-                int rc2 = RTStrCat(pszExtFileBuf, cchExtFileBuf, pszExt);
-                AssertRCReturn(rc2, rc2);
-
-                pszExtFile = pszExtFileBuf;
+                size_t cchName = strlen(pszName);
+                char *pszExtFileBuf = (char *)alloca(cchName + strlen(pszExt) + 1);
+                if (pszExtFileBuf)
+                {
+                    memcpy(pszExtFileBuf, pszName, cchName + 1);
+                    RTPathStripSuffix(pszExtFileBuf);
+                    pszExtFile = strcat(pszExtFileBuf, pszExt);
+                }
             }
         }

trunk/src/VBox/Runtime/r3/xml.cpp

@@ -2310 +2310 @@
         if (RT_FAILURE(rc))
             throw EIPRTFailure(rc, "RTStrCopy");
-        rc = RTStrCat(szTmpFilename, sizeof(szTmpFilename), s_pszTmpSuff);
-        if (RT_FAILURE(rc))
-            throw EIPRTFailure(rc, "RTStrCat");
+        strcat(szTmpFilename, s_pszTmpSuff);
 
         char szPrevFilename[RTPATH_MAX];

trunk/src/VBox/Runtime/testcase/tstRTR0CommonDriver.h

@@ -121 +121 @@
         rc = RTPathAppend(szPath, RTPATH_MAX, pszTestServiceName);
     if (RT_SUCCESS(rc))
-        rc = RTStrCat(szPath, sizeof(szPath), ".r0");
+        strcat(szPath, ".r0");
     if (RT_FAILURE(rc))
     {
@@ -129 +129 @@
 
     char szSrvReqHandler[sizeof(g_szSrvName) + sizeof("SrvReqHandler")];
-    rc = RTStrCopy(szSrvReqHandler, sizeof(szSrvReqHandler), pszTestServiceName);
-    if (RT_SUCCESS(rc))
-        rc = RTStrCat(szSrvReqHandler, sizeof(szSrvReqHandler), "SrvReqHandler");
-    if (RT_FAILURE(rc))
-    {
-        RTTestFailed(g_hTest, "RTStrCat failed with rc=%Rrc\n", rc);
-        return RTTestSummaryAndDestroy(g_hTest);
-    }
-
+    strcpy(szSrvReqHandler, pszTestServiceName);
+    strcat(szSrvReqHandler, "SrvReqHandler");
     for (size_t off = 0; RT_C_IS_LOWER(szSrvReqHandler[off]); off++)
         szSrvReqHandler[off] = RT_C_TO_UPPER(szSrvReqHandler[off]);

trunk/src/VBox/VMM/VMMR3/DBGFR3PlugIn.cpp

@@ -280 +280 @@
     int rc = RTPathAppend(pszModule, cchModule, DBGF_PLUG_IN_PREFIX);
     AssertRCReturn(rc, VERR_TRY_AGAIN);
-    rc = RTStrCat(pszModule, cchModule, pPlugIn->szName);
-    AssertRCReturn(rc, VERR_TRY_AGAIN);
-    rc = RTStrCat(pszModule, cchModule, pszSuff);
-    AssertRCReturn(rc, VERR_TRY_AGAIN);
+    strcat(&pszModule[cchPath], pPlugIn->szName);
+    strcat(&pszModule[cchPath + sizeof(DBGF_PLUG_IN_PREFIX) - 1 + pPlugIn->cchName], pszSuff);
     Assert(strlen(pszModule) < cchModule - 4);
 
@@ -482 +480 @@
     rc = RTPathAppend(szPath, sizeof(szPath) - cchSuff, DBGF_PLUG_IN_PREFIX "*");
     AssertRCReturnVoid(rc);
-    rc = RTStrCat(szPath, sizeof(szPath), pszSuff);
-    AssertRCReturnVoid(rc);
+    strcat(szPath, pszSuff);
 
     RTDIR hDir;

trunk/src/VBox/ValidationKit/utils/fs/FsPerf.cpp

@@ -2954 +2954 @@
 {
     char szRenamed[FSPERF_MAX_PATH];
-    RTTESTI_CHECK_RC_OK(RTStrCat(RTStrCopy2(szRenamed, sizeof(szRenamed), pszFile), sizeof(szRenamed), "-renamed"));
+    strcat(strcpy(szRenamed, pszFile), "-renamed");
     if (!(iIteration & 1))
         return RTPathRename(pszFile, szRenamed, 0);
@@ -2971 +2971 @@
 
     /* Non-existing files. */
-    RTTESTI_CHECK_RC_OK(RTStrCopy(szPath, sizeof(szPath), InEmptyDir(RT_STR_TUPLE("other-no-such-file"))));
+    strcpy(szPath, InEmptyDir(RT_STR_TUPLE("other-no-such-file")));
     RTTESTI_CHECK_RC(RTPathRename(InEmptyDir(RT_STR_TUPLE("no-such-file")), szPath, 0), VERR_FILE_NOT_FOUND);
-
-    RTTESTI_CHECK_RC_OK(RTStrCopy(szPath, sizeof(szPath), InEmptyDir(RT_STR_TUPLE("no-such-dir" RTPATH_SLASH_STR "other-no-such-file"))));
+    strcpy(szPath, InEmptyDir(RT_STR_TUPLE("no-such-dir" RTPATH_SLASH_STR "other-no-such-file")));
     RTTESTI_CHECK_RC(RTPathRename(InEmptyDir(RT_STR_TUPLE("no-such-dir" RTPATH_SLASH_STR "no-such-file")), szPath, 0),
                      FSPERF_VERR_PATH_NOT_FOUND);
-
-    RTTESTI_CHECK_RC_OK(RTStrCopy(szPath, sizeof(szPath), InEmptyDir(RT_STR_TUPLE("other-no-such-file"))));
+    strcpy(szPath, InEmptyDir(RT_STR_TUPLE("other-no-such-file")));
     RTTESTI_CHECK_RC(RTPathRename(InDir(RT_STR_TUPLE("known-file" RTPATH_SLASH_STR "no-such-file")), szPath, 0), VERR_PATH_NOT_FOUND);
 
@@ -2985 +2983 @@
                                      RTFILE_O_CREATE_REPLACE | RTFILE_O_DENY_NONE | RTFILE_O_WRITE), VINF_SUCCESS);
     RTTESTI_CHECK_RC(RTFileClose(hFile1), VINF_SUCCESS);
-    RTTESTI_CHECK_RC_OK(RTStrCat(RTStrCopy2(szPath, sizeof(szPath), g_szDir), sizeof(szPath), "-no-such-dir" RTPATH_SLASH_STR "file16"));
+    strcat(strcpy(szPath, g_szDir), "-no-such-dir" RTPATH_SLASH_STR "file16");
     RTTESTI_CHECK_RC(RTPathRename(szPath, g_szDir, 0), FSPERF_VERR_PATH_NOT_FOUND);
     RTTESTI_CHECK_RC(RTPathRename(g_szDir, szPath, 0), FSPERF_VERR_PATH_NOT_FOUND);
 
     /* Shallow: */
-    RTTESTI_CHECK_RC_OK(RTStrCat(RTStrCopy2(szPath, sizeof(szPath), g_szDir), sizeof(szPath), "-other"));
+    strcat(strcpy(szPath, g_szDir), "-other");
     PROFILE_FN(RTPathRename(iIteration & 1 ? szPath : g_szDir, iIteration & 1 ? g_szDir : szPath, 0), g_nsTestRun, "RTPathRename");
 
@@ -2998 +2996 @@
     RTTESTI_CHECK_RC(RTFileClose(hFile1), VINF_SUCCESS);
 
-    RTTESTI_CHECK_RC_OK(RTStrCat(RTStrCopy2(szPath, sizeof(szPath), g_szDeepDir), sizeof(szPath), "-other"));
+    strcat(strcpy(szPath, g_szDeepDir), "-other");
     PROFILE_FN(RTPathRename(iIteration & 1 ? szPath : g_szDeepDir, iIteration & 1 ? g_szDeepDir : szPath, 0),
                g_nsTestRun, "RTPathRename/deep");

trunk/src/VBox/ValidationKit/utils/misc/loadgenerator.cpp

@@ -98 +98 @@
     if (RT_SUCCESS(rc))
     {
-        rc = RTStrCat(szPath, sizeof(szPath), "/loadgeneratorR0.r0");
+        strcat(szPath, "/loadgeneratorR0.r0");
+        void *pvImageBase;
+        rc = SUPR3LoadServiceModule(szPath, "loadgeneratorR0", "LoadGenR0ServiceReqHandler", &pvImageBase);
         if (RT_SUCCESS(rc))
         {
-            void *pvImageBase;
-            rc = SUPR3LoadServiceModule(szPath, "loadgeneratorR0", "LoadGenR0ServiceReqHandler", &pvImageBase);
-            if (RT_SUCCESS(rc))
-            {
-                /* done */
-            }
-            else
-                RTMsgError("SUPR3LoadServiceModule(%s): %Rrc", szPath, rc);
+            /* done */
         }
         else
-            RTMsgError("RTStrCat(%s): %Rrc", szPath, rc);
+            RTMsgError("SUPR3LoadServiceModule(%s): %Rrc", szPath, rc);
     }
     else

trunk/src/bldprogs/VBoxTpG.cpp

@@ -2374 +2374 @@
     if (RT_FAILURE(rc))
         return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTPathAbs failed: %Rrc", rc);
-    rc = RTStrCat(g_szAssemblerIncVal, sizeof(g_szAssemblerIncVal), "/");
-    if (RT_FAILURE(rc))
-        return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTStrCat failed: %Rrc", rc);
+    strcat(g_szAssemblerIncVal, "/");
     g_pszAssemblerIncVal = g_szAssemblerIncVal;