Changeset 78053 in vbox for trunk/src/VBox

Timestamp:

Apr 9, 2019 10:16:54 AM (6 years ago)

Author:

vboxsync

Message:

iprt/path.h: Use RT_FLEXIBLE_ARRAY in RTPATHPARSED and RTPATHSPLIT to make newer GCC versions less cranky. [build fix] bugref:9172

File:

• trunk/src/VBox/Runtime/common/misc/uri.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/common/misc/uri.cpp

@@ -880 +880 @@
      * and get it slightly wrong here).
      */
-    RTPATHPARSED ParsedPath;
-    int rc = RTPathParse(pszPath, &ParsedPath, sizeof(ParsedPath), fPathStyle);
+    union
+    {
+        RTPATHPARSED ParsedPath;
+        uint8_t      abPadding[sizeof(RTPATHPARSED)];
+    } u;
+    int rc = RTPathParse(pszPath, &u.ParsedPath, sizeof(u.ParsedPath), fPathStyle);
     if (RT_SUCCESS(rc) || rc == VERR_BUFFER_OVERFLOW)
     {
         /* Skip leading slashes. */
-        if (ParsedPath.fProps & RTPATH_PROP_ROOT_SLASH)
+        if (u.ParsedPath.fProps & RTPATH_PROP_ROOT_SLASH)
         {
             if (fPathStyle == RTPATH_STR_F_STYLE_DOS)
@@ -900 +904 @@
          */
         static const char s_szPrefix[] = "file:///";
-        size_t const      cchPrefix    = sizeof(s_szPrefix) - (ParsedPath.fProps & RTPATH_PROP_UNC ? 2 : 1);
+        size_t const      cchPrefix    = sizeof(s_szPrefix) - (u.ParsedPath.fProps & RTPATH_PROP_UNC ? 2 : 1);
         size_t cchEncoded = rtUriCalcEncodedLength(pszPath, cchPath, fPathStyle != RTPATH_STR_F_STYLE_DOS);