Changeset 73097 in vbox for trunk/src/VBox/Main/src-server/darwin

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/Main/src-server/darwin

Files:

• NetIf-darwin.cpp (modified) (1 diff)
• iokit.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-server/darwin/NetIf-darwin.cpp

@@ -342 +342 @@
                 break;
             }
-        PNETIFINFO pNew = (PNETIFINFO)RTMemAllocZ(RT_OFFSETOF(NETIFINFO, szName[cbNameLen]));
+        PNETIFINFO pNew = (PNETIFINFO)RTMemAllocZ(RT_UOFFSETOF_DYN(NETIFINFO, szName[cbNameLen]));
         if (!pNew)
         {

trunk/src/VBox/Main/src-server/darwin/iokit.cpp

@@ -1549 +1549 @@
                 /* Create the device. */
                 size_t cbName = strlen(szName) + 1;
-                PDARWINDVD pNew = (PDARWINDVD)RTMemAlloc(RT_OFFSETOF(DARWINDVD, szName[cbName]));
+                PDARWINDVD pNew = (PDARWINDVD)RTMemAlloc(RT_UOFFSETOF_DYN(DARWINDVD, szName[cbName]));
                 if (pNew)
                 {
@@ -1777 +1777 @@
 
                         size_t cchName = strlen(szTmp);
-                        PDARWINETHERNIC pNew = (PDARWINETHERNIC)RTMemAlloc(RT_OFFSETOF(DARWINETHERNIC, szName[cchName + 1]));
+                        PDARWINETHERNIC pNew = (PDARWINETHERNIC)RTMemAlloc(RT_UOFFSETOF_DYN(DARWINETHERNIC, szName[cchName + 1]));
                         if (pNew)
                         {