Changeset 21746 in vbox for trunk/src/VBox/Runtime/common

Timestamp:

Jul 21, 2009 12:58:49 PM (16 years ago)

Author:

vboxsync

Message:

Runtime: little corrections

File:

• trunk/src/VBox/Runtime/common/checksum/manifest.cpp (modified) (7 diffs)

trunk/src/VBox/Runtime/common/checksum/manifest.cpp

@@ -57 +57 @@
 *******************************************************************************/
 
-RTR3DECL(int) RTManifestVerify(const char *pszManifestFile, PRTMANIFESTTEST pTestList, size_t cTests, size_t *pcFileIndexOnFailure)
+RTR3DECL(int) RTManifestVerify(const char *pszManifestFile, PRTMANIFESTTEST paTests, size_t cTests, size_t *piFailed)
 {
     /* Validate input */
-    if (!pszManifestFile || !pTestList)
-    {
-        AssertMsgFailed(("Must supply pszManifestFile and pTestList!\n"));
+    if (!pszManifestFile || !paTests)
+    {
+        AssertMsgFailed(("Must supply pszManifestFile and paTests!\n"));
         return VERR_INVALID_PARAMETER;
     }
@@ -77 +77 @@
     /* Fill our compare list */
     for (size_t i=0; i < cTests; ++i)
-        pFileList[i].pTestPattern = &pTestList[i];
+        pFileList[i].pTestPattern = &paTests[i];
 
     /* Parse the manifest file line by line */
@@ -173 +173 @@
             if (RTStrICmp(pFileList[i].pszManifestDigest, pFileList[i].pTestPattern->pszTestDigest))
             {
-                if (pcFileIndexOnFailure)
-                    *pcFileIndexOnFailure = i;
+                if (piFailed)
+                    *piFailed = i;
                 rc = VERR_MANIFEST_DIGEST_MISMATCH;
                 break;
@@ -194 +194 @@
 }
 
-RTR3DECL(int) RTManifestVerifyFiles(const char *pszManifestFile, const char **ppszFiles, size_t cFiles, size_t *pcFileIndexOnFailure)
+RTR3DECL(int) RTManifestVerifyFiles(const char *pszManifestFile, const char * const *papszFiles, size_t cFiles, size_t *piFailed)
 {
     /* Validate input */
-    if (!pszManifestFile || !ppszFiles)
-    {
-        AssertMsgFailed(("Must supply pszManifestFile and ppszFiles!\n"));
+    if (!pszManifestFile || !papszFiles)
+    {
+        AssertMsgFailed(("Must supply pszManifestFile and papszFiles!\n"));
         return VERR_INVALID_PARAMETER;
     }
@@ -213 +213 @@
     {
         char *pszDigest;
-        rc = RTSHA1Digest(ppszFiles[i], &pszDigest);
+        rc = RTSHA1Digest(papszFiles[i], &pszDigest);
         if (RT_FAILURE(rc))
             break;
-        pFileList[i].pszTestFile = (char*)ppszFiles[i];
+        pFileList[i].pszTestFile = (char*)papszFiles[i];
         pFileList[i].pszTestDigest = pszDigest;
     }
     /* Do the verify */
     if (RT_SUCCESS(rc))
-        rc = RTManifestVerify(pszManifestFile, pFileList, cFiles, pcFileIndexOnFailure);
+        rc = RTManifestVerify(pszManifestFile, pFileList, cFiles, piFailed);
 
     /* Cleanup */
@@ -234 +234 @@
 }
 
-RTR3DECL(int) RTManifestWriteFiles(const char *pszManifestFile, const char **ppszFiles, size_t cFiles)
+RTR3DECL(int) RTManifestWriteFiles(const char *pszManifestFile, const char * const *papszFiles, size_t cFiles)
 {
     /* Validate input */
-    if (!pszManifestFile || !ppszFiles)
-    {
-        AssertMsgFailed(("Must supply pszManifestFile and ppszFiles!\n"));
+    if (!pszManifestFile || !papszFiles)
+    {
+        AssertMsgFailed(("Must supply pszManifestFile and papszFiles!\n"));
         return VERR_INVALID_PARAMETER;
     }
@@ -253 +253 @@
         /* Calculate the SHA1 digest of every file */
         char *pszDigest;
-        rc = RTSHA1Digest(ppszFiles[i], &pszDigest);
+        rc = RTSHA1Digest(papszFiles[i], &pszDigest);
         if (RT_FAILURE(rc))
             break;
         /* Add the entry to the manifest file */
-        int cbRet = RTStrmPrintf(pStream, "SHA1 (%s)= %s\n", RTPathFilename(ppszFiles[i]), pszDigest);
+        int cbRet = RTStrmPrintf(pStream, "SHA1 (%s)= %s\n", RTPathFilename(papszFiles[i]), pszDigest);
         RTStrFree(pszDigest);
         if (cbRet < 0)