Changeset 103275 in vbox for trunk/src/VBox/ValidationKit/utils

Timestamp:

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

Author:

vboxsync

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

161567

Message:

Backed out r161549 again (not wanted / bloat).

Location:

trunk/src/VBox/ValidationKit/utils

Files:

• fs/FsPerf.cpp (modified) (4 diffs)
• misc/loadgenerator.cpp (modified) (1 diff)

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