Changeset 34535 in vbox for trunk/include/iprt

Timestamp:

Nov 30, 2010 5:46:14 PM (14 years ago)

Author:

vboxsync

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

68326

Message:

Manifest comparison.

Location:

trunk/include/iprt

Files:

• manifest.h (modified) (1 diff)
• vfs.h (modified) (1 diff)

trunk/include/iprt/manifest.h

@@ -104 +104 @@
  * @param   papszIgnoreEntries  Entries to ignore.  Ends with a NULL entry.
  * @param   papszIgnoreAttrs    Attributes to ignore.  Ends with a NULL entry.
- * @param   pszEntry            Where to store the name of the mismatching
+ * @param   fFlags              A combination of RTMANIFEST_EQUALS_XXX values.
+ * @param   pszError            Where to store the name of the mismatching
  *                              entry, or as much of the name as there is room
  *                              for.  This is always set.  Optional.
- * @param   cbEntry             The size of the buffer pointed to by @a
- *                              pszEntry.
+ * @param   cbError             The size of the buffer pointed to by @a
+ *                              pszError.
  */
 RTDECL(int) RTManifestEqualsEx(RTMANIFEST hManifest1, RTMANIFEST hManifest2, const char * const *papszIgnoreEntries,
-                               const char * const *papszIgnoreAttr, char *pszEntry, size_t cbEntry);
+                               const char * const *papszIgnoreAttr, uint32_t fFlags, char *pszError, size_t cbError);
+
+/** @defgroup RTMANIFEST_EQUALS_XXX     RTManifestEqualsEx flags
+ * @{ */
+/** Ignore missing attributes if there is one or more to compare. */
+#define RTMANIFEST_EQUALS_IGN_MISSING_ATTRS         RT_BIT_32(0)
+/** Ignore attributes missing in the 1st manifest.
+ * @todo implement this  */
+#define RTMANIFEST_EQUALS_IGN_MISSING_ATTRS_1ST     RT_BIT_32(1)
+/** Mask of valid flags. */
+#define RTMANIFEST_EQUALS_VALID_MASK                UINT32_C(0x00000003)
+/** @}  */
 
 /**

trunk/include/iprt/vfs.h

@@ -702 +702 @@
 RTDECL(RTFOFF)      RTVfsFileTell(RTVFSFILE hVfsFile);
 
+/**
+ * Changes the current read/write position of a file.
+ *
+ * @returns IPRT status code.
+ *
+ * @param   hVfsFile        The VFS file handle.
+ * @param   offSeek         The seek offset.
+ * @param   uMethod         The seek emthod.
+ * @param   poffActual      Where to optionally return the new file offset.
+ *
+ * @sa      RTFileSeek
+ */
 RTDECL(int)         RTVfsFileSeek(RTVFSFILE hVfsFile, RTFOFF offSeek, uint32_t uMethod, uint64_t *poffActual);
+
 RTDECL(int)         RTVfsFileSetSize(RTVFSFILE hVfsFile, uint64_t cbSize);
 RTDECL(int)         RTVfsFileGetSize(RTVFSFILE hVfsFile, uint64_t *pcbSize);