Changeset 103024 in vbox for trunk/include

Timestamp:

Jan 24, 2024 1:37:01 PM (10 months ago)

Author:

vboxsync

Message:

iprt/string.h,VBoxGuest-linux.c,linux/sharedfolders/vfsmod.c: Replaced the very few RT_STRSCPY uses with RTStrCopy and removed the macro. bugref:10584

File:

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

trunk/include/iprt/string.h

@@ -244 +244 @@
 #else  /* !RT_OS_LINUX && !__KERNEL__ */
 # define RT_BCOPY_UNFORTIFIED(a_pDst, a_pSrc, a_cbToCopy)   memcpy((a_pDst), (a_pSrc), (a_cbToCopy))
-#endif /* !RT_OS_LINUX && !__KERNEL__ */
-
-/** @def RT_STRSCPY
- * Copy string and NULL-terminate output buffer.
- *
- * This macro should mostly be used in Linux kernel code. This is
- * the replacement for deprecated strlcpy. It was deprecated since 4.3.0
- * when strscpy was introduced as an alternative. Finally, strlcpy was
- * completely removed from kernel code in 6.8.0.
- *
- * @param   a_pDst          Pointer to the destination string buffer.
- * @param   a_pSrc          Pointer to the source NULL-terminated string buffer.
- * @param   a_cbDst         Size of destination buffer.
- */
-#if defined(RT_OS_LINUX) && defined(__KERNEL__)
-# if (RTLNX_VER_MIN(4,3,0))
-#  define RT_STRSCPY(a_pDst, a_pSrc, a_cbDst) \
-    { \
-      ssize_t _ret; \
-      _ret = strscpy((a_pDst), (a_pSrc), (a_cbDst)); \
-    }
-# else /* < 4.3.0 */
-#  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)    strlcpy((a_pDst), (a_pSrc), (a_cbDst))
 #endif /* !RT_OS_LINUX && !__KERNEL__ */