Changeset 101657 in vbox for trunk/src/VBox/Runtime/common

Timestamp:

Oct 30, 2023 1:17:13 PM (15 months ago)

Author:

vboxsync

Message:

Runtime/uri.cpp: Make it build on linux.arm64 with -Werror, bugref:10541

File:

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

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

@@ -73 +73 @@
  *  delims  = '<' , '>' , '#' , '%' , '"'
  *  unwise  = '{' , '}' , '|' , '\' , '^' , '[' , ']' , '`'
+ *
+ * @note ARM defines char as unsigned by default in the AAPCS(64) so the first check would trigger
+ *       a compiler warning/error. Apple decided to ignore that and declares char a signed like on
+ *       the other platforms.
  */
-#define URI_EXCLUDED(a) \
+#if    defined(RT_OS_LINUX) \
+    && (defined(RT_ARCH_ARM64) || defined(RT_ARCH_ARM32))
+# define URI_EXCLUDED(a) \
+  (   ((a) <= 0x20) \
+   || ((a) >= 0x5B && (a) <= 0x5E) \
+   || ((a) >= 0x7B && (a) <= 0x7D) \
+   || (a) == '<' || (a) == '>' || (a) == '#' \
+   || (a) == '%' || (a) == '"' || (a) == '`' )
+#else
+# define URI_EXCLUDED(a) \
   (   ((a) >= 0x0  && (a) <= 0x20) \
    || ((a) >= 0x5B && (a) <= 0x5E) \
@@ -80 +93 @@
    || (a) == '<' || (a) == '>' || (a) == '#' \
    || (a) == '%' || (a) == '"' || (a) == '`' )
+#endif
 
 static char *rtUriPercentEncodeN(const char *pszString, size_t cchMax)