Changeset 19350 in vbox

Timestamp:

May 5, 2009 2:44:04 AM (16 years ago)

Author:

vboxsync

Message:

IPRT,tstDisasm-2: defined flags for RTFileReadAllEx and RTFileReadAllHandleEx.

Location:

trunk

Files:

• include/iprt/file.h (modified) (3 diffs)
• src/VBox/Disassembler/testcase/tstDisasm-2.cpp (modified) (1 diff)
• src/VBox/Runtime/generic/RTFileReadAllByHandleEx-generic.cpp (modified) (1 diff)
• src/VBox/Runtime/generic/RTFileReadAllEx-generic.cpp (modified) (1 diff)

trunk/include/iprt/file.h

@@ -714 +714 @@
  * @param   cbMax           The maximum number of bytes to read into memory. Specify RTFOFF_MAX
  *                          to read to the end of the file.
- * @param   fFlags          Flags for the future, must be 0.
+ * @param   fFlags          See RTFILE_RDALL_*.
  * @param   ppvFile         Where to store the pointer to the memory on successful return.
  * @param   pcbFile         Where to store the size of the file on successful return.
@@ -746 +746 @@
  * @param   cbMax           The maximum number of bytes to read into memory. Specify RTFOFF_MAX
  *                          to read to the end of the file.
- * @param   fFlags          Flags for the future, must be 0.
+ * @param   fFlags          See RTFILE_RDALL_*.
  * @param   ppvFile         Where to store the pointer to the memory on successful return.
  * @param   pcbFile         Where to store the size of the file on successful return.
@@ -763 +763 @@
 RTDECL(void) RTFileReadAllFree(void *pvFile, size_t cbFile);
 
+/** @name RTFileReadAllEx and RTFileReadAllHandleEx flags
+ * The open flags are ignored by RTFileReadAllHandleEx.
+ * @{ */
+#define RTFILE_RDALL_O_DENY_NONE            RTFILE_O_DENY_NONE
+#define RTFILE_RDALL_O_DENY_READ            RTFILE_O_DENY_READ
+#define RTFILE_RDALL_O_DENY_WRITE           RTFILE_O_DENY_WRITE
+#define RTFILE_RDALL_O_DENY_READWRITE       RTFILE_O_DENY_READWRITE
+#define RTFILE_RDALL_O_DENY_ALL             RTFILE_O_DENY_ALL
+#define RTFILE_RDALL_O_DENY_NOT_DELETE      RTFILE_O_DENY_NOT_DELETE
+#define RTFILE_RDALL_O_DENY_MASK            RTFILE_O_DENY_MASK
+/** Mask of valid flags. */
+#define RTFILE_RDALL_VALID_MASK             RTFILE_RDALL_O_DENY_MASK
+/** @} */
 
 

trunk/src/VBox/Disassembler/testcase/tstDisasm-2.cpp

@@ -990 +990 @@
             void   *pvFile;
             size_t  cbFile;
-            rc = RTFileReadAllEx(argv[iArg], off, cbMax, 0, &pvFile, &cbFile);
+            rc = RTFileReadAllEx(argv[iArg], off, cbMax, RTFILE_RDALL_O_DENY_NONE, &pvFile, &cbFile);
             if (RT_FAILURE(rc))
             {

trunk/src/VBox/Runtime/generic/RTFileReadAllByHandleEx-generic.cpp

@@ -43 +43 @@
 RTDECL(int) RTFileReadAllByHandleEx(RTFILE File, RTFOFF off, RTFOFF cbMax, uint32_t fFlags, void **ppvFile, size_t *pcbFile)
 {
-    AssertReturn(!fFlags, VERR_INVALID_PARAMETER);
+    AssertReturn(!(fFlags & ~RTFILE_RDALL_VALID_MASK), VERR_INVALID_PARAMETER);
 
     /*

trunk/src/VBox/Runtime/generic/RTFileReadAllEx-generic.cpp

@@ -41 +41 @@
 RTDECL(int) RTFileReadAllEx(const char *pszFilename, RTFOFF off, RTFOFF cbMax, uint32_t fFlags, void **ppvFile, size_t *pcbFile)
 {
-    AssertReturn(!fFlags, VERR_INVALID_PARAMETER);
+    AssertReturn(!(fFlags & ~RTFILE_RDALL_VALID_MASK), VERR_INVALID_PARAMETER);
 
     RTFILE File;
-    int rc = RTFileOpen(&File, pszFilename, RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
+    int rc = RTFileOpen(&File, pszFilename, RTFILE_O_READ | RTFILE_O_OPEN | (fFlags & RTFILE_RDALL_O_DENY_MASK));
     if (RT_SUCCESS(rc))
     {