Changeset 15806 in vbox for trunk/src/VBox/Runtime

Timestamp:

Jan 5, 2009 3:09:48 PM (16 years ago)

Author:

vboxsync

Message:

tstPath: style.

File:

• trunk/src/VBox/Runtime/testcase/tstPath.cpp (modified) (9 diffs)

trunk/src/VBox/Runtime/testcase/tstPath.cpp

@@ -98 +98 @@
         const char *pcszOutput;
     }
-    aRTPathAbsExTests[] =
+    s_aRTPathAbsExTests[] =
     {
 #if defined (RT_OS_OS2) || defined (RT_OS_WINDOWS)
@@ -152 +152 @@
     };
 
-    for (unsigned i = 0; i < RT_ELEMENTS(aRTPathAbsExTests); ++ i)
-    {
-        rc = RTPathAbsEx(aRTPathAbsExTests[i].pcszInputBase,
-                         aRTPathAbsExTests[i].pcszInputPath,
+    for (unsigned i = 0; i < RT_ELEMENTS(s_aRTPathAbsExTests); ++ i)
+    {
+        rc = RTPathAbsEx(s_aRTPathAbsExTests[i].pcszInputBase,
+                         s_aRTPathAbsExTests[i].pcszInputPath,
                          szPath, sizeof(szPath));
-        if (rc != aRTPathAbsExTests[i].rc)
+        if (rc != s_aRTPathAbsExTests[i].rc)
         {
             RTPrintf("tstPath: RTPathAbsEx unexpected result code!\n"
@@ -165 +165 @@
                      "           rc: %Rrc\n"
                      "  expected rc: %Rrc\n",
-                     aRTPathAbsExTests[i].pcszInputBase,
-                     aRTPathAbsExTests[i].pcszInputPath,
+                     s_aRTPathAbsExTests[i].pcszInputBase,
+                     s_aRTPathAbsExTests[i].pcszInputPath,
                      szPath, rc,
-                     aRTPathAbsExTests[i].rc);
+                     s_aRTPathAbsExTests[i].rc);
             cErrors++;
             continue;
@@ -175 +175 @@
         char szTmp[RTPATH_MAX];
         char *pszExpected = NULL;
-        if (aRTPathAbsExTests[i].pcszOutput != NULL)
+        if (s_aRTPathAbsExTests[i].pcszOutput != NULL)
         {
-            if (aRTPathAbsExTests[i].pcszOutput[0] == '%')
+            if (s_aRTPathAbsExTests[i].pcszOutput[0] == '%')
             {
+                /** @todo Use RTPathGetCurrent(). */
                 if (getcwd(szTmp, sizeof(szTmp)) == NULL)
                 {
@@ -188 +189 @@
                 pszExpected = szTmp;
 
-                if (aRTPathAbsExTests[i].pcszOutput[1] == 'p')
+                if (s_aRTPathAbsExTests[i].pcszOutput[1] == 'p')
                 {
                     size_t cch = strlen(szTmp);
-                    if (cch + strlen (aRTPathAbsExTests[i].pcszOutput) - 2 <= sizeof(szTmp))
-                        strcpy (szTmp + cch, aRTPathAbsExTests[i].pcszOutput + 2);
+                    if (cch + strlen(s_aRTPathAbsExTests[i].pcszOutput) - 2 <= sizeof(szTmp))
+                        strcpy(szTmp + cch, s_aRTPathAbsExTests[i].pcszOutput + 2);
                 }
-#if defined (RT_OS_OS2) || defined (RT_OS_WINDOWS)
-                else if (aRTPathAbsExTests[i].pcszOutput[1] == 'd')
+#if defined(RT_OS_OS2) || defined(RT_OS_WINDOWS)
+                else if (s_aRTPathAbsExTests[i].pcszOutput[1] == 'd')
                 {
-                    if (2 + strlen (aRTPathAbsExTests[i].pcszOutput) - 2 <= sizeof(szTmp))
-                        strcpy (szTmp + 2, aRTPathAbsExTests[i].pcszOutput + 2);
+                    if (2 + strlen(s_aRTPathAbsExTests[i].pcszOutput) - 2 <= sizeof(szTmp))
+                        strcpy(szTmp + 2, s_aRTPathAbsExTests[i].pcszOutput + 2);
                 }
 #endif
@@ -204 +205 @@
             else
             {
-                strcpy(szTmp, aRTPathAbsExTests[i].pcszOutput);
+                strcpy(szTmp, s_aRTPathAbsExTests[i].pcszOutput);
                 pszExpected = szTmp;
             }
@@ -215 +216 @@
                          "       output: '%s'\n"
                          "     expected: '%s'\n",
-                         aRTPathAbsExTests[i].pcszInputBase,
-                         aRTPathAbsExTests[i].pcszInputPath,
+                         s_aRTPathAbsExTests[i].pcszInputBase,
+                         s_aRTPathAbsExTests[i].pcszInputPath,
                          szPath,
-                         aRTPathAbsExTests[i].pcszOutput);
+                         s_aRTPathAbsExTests[i].pcszOutput);
                 cErrors++;
             }
@@ -228 +229 @@
      */
     RTPrintf("tstPath: RTPathStripFilename...\n");
-    static const char *apszStripFilenameTests[] =
+    static const char *s_apszStripFilenameTests[] =
     {
         "/usr/include///",              "/usr/include//",
@@ -242 +243 @@
 #endif
     };
-    for (unsigned i = 0; i < RT_ELEMENTS(apszStripFilenameTests); i += 2)
-    {
-        const char *pszInput  = apszStripFilenameTests[i];
-        const char *pszExpect = apszStripFilenameTests[i + 1];
+    for (unsigned i = 0; i < RT_ELEMENTS(s_apszStripFilenameTests); i += 2)
+    {
+        const char *pszInput  = s_apszStripFilenameTests[i];
+        const char *pszExpect = s_apszStripFilenameTests[i + 1];
         char szPath[RTPATH_MAX];
         strcpy(szPath, pszInput);