Changeset 73097 in vbox for trunk/src/VBox/Runtime/common/path

Timestamp:

Jul 12, 2018 9:06:33 PM (7 years ago)

Author:

vboxsync

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

123672

Message:

*: Made RT_UOFFSETOF, RT_OFFSETOF, RT_UOFFSETOF_ADD and RT_OFFSETOF_ADD work like builtin_offsetof() and require compile time resolvable requests, adding RT_UOFFSETOF_DYN for the dynamic questions that can only be answered at runtime.

Location:

trunk/src/VBox/Runtime/common/path

Files:

• RTPathGlob.cpp (modified) (6 diffs)
• RTPathSplit.cpp (modified) (1 diff)
• RTPathSplitA.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/common/path/RTPathGlob.cpp

@@ -1475 +1475 @@
     if (pGlob->cResults < RTPATHGLOB_MAX_RESULTS)
     {
-        PRTPATHGLOBENTRY pEntry = (PRTPATHGLOBENTRY)RTMemAlloc(RT_OFFSETOF(RTPATHGLOBENTRY, szPath[cchPath + 1]));
+        PRTPATHGLOBENTRY pEntry = (PRTPATHGLOBENTRY)RTMemAlloc(RT_UOFFSETOF_DYN(RTPATHGLOBENTRY, szPath[cchPath + 1]));
         if (pEntry)
         {
@@ -1515 +1515 @@
     if (pGlob->cResults < RTPATHGLOB_MAX_RESULTS)
     {
-        PRTPATHGLOBENTRY pEntry = (PRTPATHGLOBENTRY)RTMemAlloc(RT_OFFSETOF(RTPATHGLOBENTRY, szPath[cchPath + cchName + 1]));
+        PRTPATHGLOBENTRY pEntry = (PRTPATHGLOBENTRY)RTMemAlloc(RT_UOFFSETOF_DYN(RTPATHGLOBENTRY, szPath[cchPath + cchName + 1]));
         if (pEntry)
         {
@@ -1559 +1559 @@
     if (pGlob->cResults < RTPATHGLOB_MAX_RESULTS)
     {
-        PRTPATHGLOBENTRY pEntry = (PRTPATHGLOBENTRY)RTMemAlloc(RT_OFFSETOF(RTPATHGLOBENTRY, szPath[cchPath + cchName + 1]));
+        PRTPATHGLOBENTRY pEntry = (PRTPATHGLOBENTRY)RTMemAlloc(RT_UOFFSETOF_DYN(RTPATHGLOBENTRY, szPath[cchPath + cchName + 1]));
         if (pEntry)
         {
@@ -2083 +2083 @@
      * Parse the path.
      */
-    size_t        cbParsed = RT_OFFSETOF(RTPATHPARSED, aComps[1]); /** @todo 16 after testing */
+    size_t        cbParsed = RT_UOFFSETOF(RTPATHPARSED, aComps[1]); /** @todo 16 after testing */
     PRTPATHPARSED pParsed = (PRTPATHPARSED)RTMemTmpAlloc(cbParsed);
     AssertReturn(pParsed, VERR_NO_MEMORY);
@@ -2089 +2089 @@
     if (rc == VERR_BUFFER_OVERFLOW)
     {
-        cbParsed = RT_OFFSETOF(RTPATHPARSED, aComps[pParsed->cComps + 1]);
+        cbParsed = RT_UOFFSETOF_DYN(RTPATHPARSED, aComps[pParsed->cComps + 1]);
         RTMemTmpFree(pParsed);
         pParsed = (PRTPATHPARSED)RTMemTmpAlloc(cbParsed);
@@ -2112 +2112 @@
              * Allocate and initialize the glob state data structure.
              */
-            size_t      cbGlob = RT_OFFSETOF(RTPATHGLOB, aComps[pParsed->cComps + 1]);
+            size_t      cbGlob = RT_UOFFSETOF_DYN(RTPATHGLOB, aComps[pParsed->cComps + 1]);
             PRTPATHGLOB pGlob  = (PRTPATHGLOB)RTMemTmpAllocZ(cbGlob);
             if (pGlob)

trunk/src/VBox/Runtime/common/path/RTPathSplit.cpp

@@ -73 +73 @@
     uint16_t const  cchPath   = pParsedVolatile->cchPath;
     uint16_t const  offSuffix = pParsedVolatile->offSuffix;
-    uint32_t        cbNeeded  = RT_OFFSETOF(RTPATHSPLIT, apszComps[cComps])
+    uint32_t        cbNeeded  = RT_UOFFSETOF_DYN(RTPATHSPLIT, apszComps[cComps])
                               + cchPath
                               + RTPATH_PROP_FIRST_NEEDS_NO_SLASH(fProps) /* zero terminator for root spec. */

trunk/src/VBox/Runtime/common/path/RTPathSplitA.cpp

@@ -49 +49 @@
      */
     size_t cbSplit = strlen(pszPath);
-    cbSplit += RT_OFFSETOF(RTPATHSPLIT, apszComps[cbSplit / 8]) + cbSplit / 8 + 8;
+    cbSplit += RT_UOFFSETOF_DYN(RTPATHSPLIT, apszComps[cbSplit / 8]) + cbSplit / 8 + 8;
     cbSplit = RT_ALIGN(cbSplit, 64);
     PRTPATHSPLIT pSplit = (PRTPATHSPLIT)RTMemAllocTag(cbSplit, pszTag);