Changeset 102994 in vbox for trunk/include

Timestamp:

Jan 22, 2024 6:06:29 PM (16 months ago)

Author:

vboxsync

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

161226

Message:

iprt: Add wrapper for strlcpy/strscpy functions, build fix, bugref:10584.

Another way around to suppress build error when strscpy return status
is not used. Also, turn macro into strlcpy for non-Linux systems,
so for them it will be no change.

File:

• trunk/include/iprt/string.h (modified) (1 diff)

trunk/include/iprt/string.h

@@ -260 +260 @@
 #if defined(RT_OS_LINUX) && defined(__KERNEL__)
 # if (RTLNX_VER_MIN(4,3,0))
-#  define RT_STRSCPY(a_pDst, a_pSrc, a_cbDst)   (void)strscpy((a_pDst), (a_pSrc), (a_cbDst))
+#  define RT_STRSCPY(a_pDst, a_pSrc, a_cbDst) \
+    { \
+      ssize_t _ret; \
+      _ret = strscpy((a_pDst), (a_pSrc), (a_cbDst)); \
+    }
 # else /* < 3.16.60 */
 #  define RT_STRSCPY(a_pDst, a_pSrc, a_cbDst)   strlcpy((a_pDst), (a_pSrc), (a_cbDst))
 # endif
 #else  /* !RT_OS_LINUX && !__KERNEL__ */
-# define RT_STRSCPY(a_pDst, a_pSrc, a_cbDst)    (void)strscpy((a_pDst), (a_pSrc), (a_cbDst))
+# define RT_STRSCPY(a_pDst, a_pSrc, a_cbDst)    strlcpy((a_pDst), (a_pSrc), (a_cbDst))
 #endif /* !RT_OS_LINUX && !__KERNEL__ */