Changeset 100929 in vbox

Timestamp:

Aug 21, 2023 11:09:45 PM (17 months ago)

Author:

vboxsync

Message:

IPRT/vfs: Reverted r158866 after committing too much.

Location:

trunk

Files:

• include/iprt/formats/codeview.h (modified) (4 diffs)
• include/iprt/mangling.h (modified) (1 diff)
• include/iprt/vfs.h (modified) (4 diffs)
• src/VBox/Runtime/common/vfs/vfsiosmisc.cpp (modified) (1 diff)

trunk/include/iprt/formats/codeview.h

@@ -326 +326 @@
     RTCVSEGMAPHDR   Hdr;
     /** Descriptor array. */
-    RT_FLEXIBLE_ARRAY_EXTENSION
-    RTCVSEGMAPDESC  aDescs[RT_FLEXIBLE_ARRAY];
+    RTCVSEGMAPDESC  aDescs[1];
 } RTCVSEGMAP;
 /** Pointer to a segment map subsection. */
@@ -536 +535 @@
     kCvSymType_V2_LThread,
     kCvSymType_V2_GThread,
-    kCvSymType_V2_LProcMips,
-    kCvSymType_V2_GProcMips,
+    kCvSymType_V2_Unknown_1010,
+    kCvSymType_V2_Unknown_1011,
     kCvSymType_V2_FrameInfo,
     kCvSymType_V2_Compliand,
@@ -568 +567 @@
     kCvSymType_V3_MSTool,               /**< RTCVSYMV3MSTOOL */
 
-    kCvSymType_V3_ProcRef = 0x1125,
-    kCvSymType_V3_LProcRef = 0x1127,
-    kCvSymType_V3_Unknown_1128,
+    kCvSymType_V3_PubFunc1 = 0x1125,
+    kCvSymType_V3_PubFunc2 = 0x1127,
     kCvSymType_V3_SectInfo = 0x1136,
     kCvSymType_V3_SubSectInfo,
@@ -638 +636 @@
 typedef RTCVSYMV3LABEL *PRTCVSYMV3LABEL;
 typedef RTCVSYMV3LABEL const *PCRTCVSYMV3LABEL;
-
-/**
- * kCvSymType_V2_LData, kCvSymType_V2_GData and kCvSymType_V2_Pub format.
- *
- * Same as RTCVSYMV3TYPEDNAME but with pascal string name, rather than C.
- */
-typedef struct RTCVSYMV2TYPEDNAME
-{
-    /** The type ID. */
-    uint32_t        idType;
-    /** Offset into iSection of this symbol. */
-    uint32_t        offSection;
-    /** The index of the section where the symbol lives. */
-    uint16_t        iSection;
-    /** Name length. */
-    uint8_t         cchName;
-    /** Zero terminated symbol name (variable length). */
-    RT_FLEXIBLE_ARRAY_EXTENSION
-    char            achName[RT_FLEXIBLE_ARRAY];
-} RTCVSYMV2TYPEDNAME;
-AssertCompileMemberOffset(RTCVSYMV2TYPEDNAME, achName, 11);
-typedef RTCVSYMV2TYPEDNAME *PRTCVSYMV2TYPEDNAME;
-typedef RTCVSYMV2TYPEDNAME const *PCRTCVSYMV2TYPEDNAME;
 
 /**

trunk/include/iprt/mangling.h

@@ -2916 +2916 @@
 # define RTVfsFileQueryMaxSize                          RT_MANGLER(RTVfsFileQueryMaxSize)
 # define RTVfsFileRead                                  RT_MANGLER(RTVfsFileRead)
-# define RTVfsFileReadAll                               RT_MANGLER(RTVfsFileReadAll)
-# define RTVfsFileReadAllFree                           RT_MANGLER(RTVfsFileReadAllFree)
 # define RTVfsFileReadAt                                RT_MANGLER(RTVfsFileReadAt)
 # define RTVfsFileRelease                               RT_MANGLER(RTVfsFileRelease)

trunk/include/iprt/vfs.h

@@ -1066 +1066 @@
  * Reads the remainder of the stream into a memory buffer.
  *
- * For simplifying string-style processing, there is a zero byte after the
+ * For simplifying string-style processing, the is a zero byte after the
  * returned buffer, making sure it can be used as a zero terminated string.
  *
@@ -1074 +1074 @@
  *                          RTVfsIoStrmReadAllFree for freeing, not RTMemFree!
  * @param   pcbBuf          Where to return the buffer size.
- * @sa      RTVfsFileReadAll
  */
 RTDECL(int)         RTVfsIoStrmReadAll(RTVFSIOSTREAM hVfsIos, void **ppvBuf, size_t *pcbBuf);
@@ -1083 +1082 @@
  * @param   pvBuf           What RTVfsIoStrmReadAll returned.
  * @param   cbBuf           What RTVfsIoStrmReadAll returned.
- * @sa      RTVfsFileReadAllFree
  */
 RTDECL(void)        RTVfsIoStrmReadAllFree(void *pvBuf, size_t cbBuf);
@@ -1410 +1408 @@
 RTDECL(int)         RTVfsFileRead(RTVFSFILE hVfsFile, void *pvBuf, size_t cbToRead, size_t *pcbRead);
 RTDECL(int)         RTVfsFileReadAt(RTVFSFILE hVfsFile, RTFOFF off, void *pvBuf, size_t cbToRead, size_t *pcbRead);
-
-/**
- * Reads the remainder of the file into a memory buffer.
- *
- * For simplifying string-style processing, there is a zero byte after the
- * returned buffer, making sure it can be used as a zero terminated string.
- *
- * @returns IPRT status code.
- * @param   hVfsIos         The VFS I/O stream handle.
- * @param   ppvBuf          Where to return the buffer.  Must pass to
- *                          RTVfsFileReadAllFree for freeing, not RTMemFree!
- * @param   pcbBuf          Where to return the buffer size.
- * @sa      RTVfsIoStrmReadAll
- */
-RTDECL(int)         RTVfsFileReadAll(RTVFSFILE hVfsFile, void **ppvBuf, size_t *pcbBuf);
-
-/**
- * Free memory buffer returned by RTVfsFileReadAll.
- *
- * @param   pvBuf           What RTVfsFileReadAll returned.
- * @param   cbBuf           What RTVfsFileReadAll returned.
- * @sa      RTVfsIoStrmReadAllFree
- */
-RTDECL(void)        RTVfsFileReadAllFree(void *pvBuf, size_t cbBuf);
 
 /**

trunk/src/VBox/Runtime/common/vfs/vfsiosmisc.cpp

@@ -237 +237 @@
 }
 
-
-RTDECL(int) RTVfsFileReadAll(RTVFSFILE hVfsFile, void **ppvBuf, size_t *pcbBuf)
-{
-    RTVFSIOSTREAM hVfsIos = RTVfsFileToIoStream(hVfsFile);
-    int rc = RTVfsIoStrmReadAll(hVfsIos, ppvBuf, pcbBuf);
-    RTVfsIoStrmRelease(hVfsIos);
-    return rc;
-}
-
-
-RTDECL(void) RTVfsFileReadAllFree(void *pvBuf, size_t cbBuf)
-{
-    RTVfsIoStrmReadAllFree(pvBuf, cbBuf);
-}
-