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

Timestamp:

Nov 26, 2010 5:25:58 PM (14 years ago)

Author:

vboxsync

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

68189

Message:

VBoxExtPAckHelperApp.cpp: More code.

File:

• trunk/src/VBox/Runtime/common/checksum/manifest2.cpp (modified) (3 diffs)

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

@@ -222 +222 @@
 
 
-/**
- * Compares two manifests for equality.
- *
- * @returns true if equals, false if not.
- * @param   hManifest1          The first manifest.
- * @param   hManifest2          The second manifest.
- * @param   papszIgnoreEntries  Entries to ignore.  Ends with a NULL entry.
- * @param   papszIgnoreAttrs    Attributes to ignore.  Ends with a NULL entry.
- */
 RTDECL(int) RTManifestEqualsEx(RTMANIFEST hManifest1, RTMANIFEST hManifest2, const char * const *papszIgnoreEntries,
-                               const char * const *papszIgnoreAttr)
-{
+                               const char * const *papszIgnoreAttr, char *pszEntry, size_t cbEntry)
+{
+    /*
+     * Validate input.
+     */
+    AssertPtrNullReturn(pszEntry, VERR_INVALID_POINTER);
+    if (pszEntry && cbEntry)
+        *pszEntry = '\0';
     RTMANIFESTINT *pThis1 = hManifest1;
     RTMANIFESTINT *pThis2 = hManifest1;
     if (pThis1 != NIL_RTMANIFEST)
     {
-        AssertPtrReturn(pThis1, false);
-        AssertReturn(pThis1->u32Magic == RTMANIFEST_MAGIC, false);
+        AssertPtrReturn(pThis1, VERR_INVALID_HANDLE);
+        AssertReturn(pThis1->u32Magic == RTMANIFEST_MAGIC, VERR_INVALID_HANDLE);
     }
     if (pThis2 != NIL_RTMANIFEST)
     {
-        AssertPtrReturn(pThis2, false);
-        AssertReturn(pThis2->u32Magic == RTMANIFEST_MAGIC, false);
+        AssertPtrReturn(pThis2, VERR_INVALID_HANDLE);
+        AssertReturn(pThis2->u32Magic == RTMANIFEST_MAGIC, VERR_INVALID_HANDLE);
     }
 
@@ -251 +248 @@
      */
     if (pThis1 == pThis2)
-        return true;
+        return VINF_SUCCESS;
     if (pThis1 == NIL_RTMANIFEST || pThis2 == NIL_RTMANIFEST)
-        return false;
+        return VERR_NOT_EQUAL;
 
     /*
@@ -266 +263 @@
 
 
-/**
- * Compares two manifests for equality.
- *
- * @returns true if equals, false if not.
- * @param   hManifest1          The first manifest.
- * @param   hManifest2          The second manifest.
- */
 RTDECL(int) RTManifestEquals(RTMANIFEST hManifest1, RTMANIFEST hManifest2)
 {
-    return RTManifestEqualsEx(hManifest1, hManifest2, NULL /*papszIgnoreEntries*/, NULL /*papszIgnoreAttrs*/);
+    return RTManifestEqualsEx(hManifest1, hManifest2, NULL /*papszIgnoreEntries*/, NULL /*papszIgnoreAttrs*/, NULL, 0);
 }