Changeset 33463 in vbox for trunk/src

Timestamp:

Oct 26, 2010 12:27:26 PM (14 years ago)

Author:

vboxsync

Message:

isofs.cpp: Use static! RTStrAPrintf fixes.

File:

• trunk/src/VBox/Runtime/r3/isofs.cpp (modified) (11 diffs)

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

@@ -30 +30 @@
 *******************************************************************************/
 #include <iprt/isofs.h>
+
+#include <iprt/file.h>
+#include <iprt/err.h>
+#include <iprt/mem.h>
 #include <iprt/path.h>
-
-
-/**
- * Destroys the patch cache.
+#include <iprt/string.h>
+
+
+/**
+ * Destroys the path cache.
  *
  * @param   pFile           ISO handle.
  */
-RTR3DECL(void) rtIsoFsDestroyPathCache(PRTISOFSFILE pFile)
+static void rtIsoFsDestroyPathCache(PRTISOFSFILE pFile)
 {
     PRTISOFSPATHTABLEENTRY pNode = RTListNodeGetFirst(&pFile->listPaths, RTISOFSPATHTABLEENTRY, Node);
@@ -69 +74 @@
  * @param   pHeader     Path header information to add.
  */
-RTR3DECL(int) rtIsoFsAddToPathCache(PRTLISTNODE pList, const char *pszPath,
-                                    RTISOFSPATHTABLEHEADER *pHeader)
+static int rtIsoFsAddToPathCache(PRTLISTNODE pList, const char *pszPath,
+                                 RTISOFSPATHTABLEHEADER *pHeader)
 {
     AssertPtrReturn(pList, VERR_INVALID_PARAMETER);
@@ -106 +111 @@
  * @param   ppszPath        Pointer to a pointer to store the retrieved full path to.
  */
-RTR3DECL(int) rtIsoFsGetParentPathSub(PRTLISTNODE pList, PRTISOFSPATHTABLEENTRY pNode,
-                                      char *pszPathNode, char **ppszPath)
+static int rtIsoFsGetParentPathSub(PRTLISTNODE pList, PRTISOFSPATHTABLEENTRY pNode,
+                                   char *pszPathNode, char **ppszPath)
 {
     int rc = VINF_SUCCESS;
@@ -119 +124 @@
             pNodeParent =  RTListNodeGetNext(&pNodeParent->Node, RTISOFSPATHTABLEENTRY, Node);
         /* Construct intermediate path (parent + current path). */
-        char *pszPath;
-        if (RTStrAPrintf(&pszPath, "%s/%s", pNodeParent->path, pszPathNode))
+        char *pszPath = RTPathJoinA(pNodeParent->path, pszPathNode);
+        if (pszPath)
         {
             /* ... and do the same with the parent's parent until we reached the root. */
@@ -127 +132 @@
         }
         else
-            rc = VERR_NO_MEMORY;
+            rc = VERR_NO_STR_MEMORY;
     }
     else /* No parent (left), this must be the root path then. */
-    {
-        char *pszPath = RTStrDup(pszPathNode);
-        *ppszPath = pszPath;
-    }
+        *ppszPath = RTStrDup(pszPathNode);
     return rc;
 }
@@ -144 +146 @@
  * @param   pFile                   ISO handle.
  */
-RTR3DECL(int) rtIsoFsUpdatePathCache(PRTISOFSFILE pFile)
+static int rtIsoFsUpdatePathCache(PRTISOFSFILE pFile)
 {
     AssertPtrReturn(pFile, VERR_INVALID_PARAMETER);
@@ -302 +304 @@
  *                                  rtIsoFsFreeDirectoryRecord().
  */
-RTR3DECL(int) rtIsoFsFindEntry(PRTISOFSFILE pFile, const char *pszFileName,
-                               uint32_t uExtentSector, uint32_t cbExtent /* Bytes */,
-                               PRTISOFSDIRRECORD *ppRec)
+static int rtIsoFsFindEntry(PRTISOFSFILE pFile, const char *pszFileName,
+                            uint32_t uExtentSector, uint32_t cbExtent /* Bytes */,
+                            PRTISOFSDIRRECORD *ppRec)
 {
     AssertPtrReturn(pFile, VERR_INVALID_PARAMETER);
@@ -398 +400 @@
  * @param   puSector            Pointer where to store the found sector to.
  */
-RTR3DECL(int) rtIsoFsResolvePath(PRTISOFSFILE pFile, const char *pszPath, uint32_t *puSector)
+static int rtIsoFsResolvePath(PRTISOFSFILE pFile, const char *pszPath, uint32_t *puSector)
 {
     AssertPtrReturn(pFile, VERR_INVALID_PARAMETER);
@@ -447 +449 @@
  * @return  Pointer to the newly allocated directory record.
  */
-RTR3DECL(PRTISOFSDIRRECORD) rtIsoFsCreateDirectoryRecord(void)
+static PRTISOFSDIRRECORD rtIsoFsCreateDirectoryRecord(void)
 {
     PRTISOFSDIRRECORD pRecord = (PRTISOFSDIRRECORD)RTMemAlloc(sizeof(RTISOFSDIRRECORD));
@@ -459 +461 @@
  * @return  IPRT status code.
  */
-RTR3DECL(void) rtIsoFsFreeDirectoryRecord(PRTISOFSDIRRECORD pRecord)
+static void rtIsoFsFreeDirectoryRecord(PRTISOFSDIRRECORD pRecord)
 {
     RTMemFree(pRecord);
@@ -475 +477 @@
  *                                  rtIsoFsFreeDirectoryRecord().
  */
-RTR3DECL(int) rtIsoFsGetDirectoryRecord(PRTISOFSFILE pFile, const char *pszPath,
-                                        PRTISOFSDIRRECORD *ppRecord)
+static int rtIsoFsGetDirectoryRecord(PRTISOFSFILE pFile, const char *pszPath,
+                                     PRTISOFSDIRRECORD *ppRecord)
 {
     AssertPtrReturn(pFile, VERR_INVALID_PARAMETER);