Changeset 95767 in vbox

Timestamp:

Jul 20, 2022 7:40:31 PM (3 years ago)

Author:

vboxsync

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

152477

Message:

nocrt/string.h,strpbrk.cpp: Added missing strpbrk proto and synced up the implementation with it in NOCRT mode. Added a few other prototypes to make our code and windows SDK headers happy, will implement functions as needed. bugref:10261

Location:

trunk

Files:

• include/iprt/nocrt/string.h (modified) (3 diffs)
• src/VBox/Runtime/common/string/strpbrk.cpp (modified) (2 diffs)

trunk/include/iprt/nocrt/string.h

@@ -55 +55 @@
 size_t  RT_NOCRT(strlen)(const char *psz);
 size_t  RT_NOCRT(strnlen)(const char *psz, size_t cch);
+size_t  RT_NOCRT(strcspn)(const char *psz, const char *pszBreakChars);
+char *  RT_NOCRT(strpbrk)(const char *psz, const char *pszBreakChars);
 char *  RT_NOCRT(strstr)(const char *psz, const char *pszSub);
+
+size_t  RT_NOCRT(wcslen)(const wchar_t *pwsz);
+wchar_t *RT_NOCRT(wcscat)(wchar_t *pwszDst, const wchar_t *pwszSrc);
+wchar_t *RT_NOCRT(wcschr)(const wchar_t *pwszDst, wchar_t wc);
+wchar_t *RT_NOCRT(wcscpy)(wchar_t *pwszDst, const wchar_t *pwszSrc);
+int     RT_NOCRT(_wcsicmp)(const wchar_t *pwsz1, const wchar_t *pwsz2);
 
 #if !defined(RT_WITHOUT_NOCRT_WRAPPERS) && !defined(RT_WITHOUT_NOCRT_WRAPPER_ALIASES)
@@ -65 +73 @@
 # define memmove  RT_NOCRT(memmove)
 # define memset   RT_NOCRT(memset)
+
 # define strcat   RT_NOCRT(strcat)
 # define strncat  RT_NOCRT(strncat)
@@ -78 +87 @@
 # define strlen   RT_NOCRT(strlen)
 # define strnlen  RT_NOCRT(strnlen)
+# define strcspn  RT_NOCRT(strcspn)
+# define strpbrk  RT_NOCRT(strpbrk)
 # define strstr   RT_NOCRT(strstr)
+
+# define wcslen   RT_NOCRT(wcslen)
+# define wcscat   RT_NOCRT(wcscat)
+# define wcschr   RT_NOCRT(wcschr)
+# define wcscpy   RT_NOCRT(wcscpy)
+# define _wcsicmp RT_NOCRT(_wcsicmp)
 #endif
 

trunk/src/VBox/Runtime/common/string/strpbrk.cpp

@@ -37 +37 @@
  * @returns
  */
-#ifdef _MSC_VER
+#ifdef IPRT_NO_CRT
+char *strpbrk(const char *pszStr, const char *pszBreakChars)
+#elif defined(_MSC_VER)
 # if _MSC_VER >= 1400
-_CRTIMP __checkReturn _CONST_RETURN char *  __cdecl strpbrk(__in_z const char *pszStr, __in_z const char *pszChars)
+_CRTIMP __checkReturn _CONST_RETURN char *  __cdecl strpbrk(__in_z const char *pszStr, __in_z const char *pszBreakChars)
 # else
-_CRTIMP char * __cdecl strpbrk(const char *pszStr, const char *pszChars)
+_CRTIMP char * __cdecl strpbrk(const char *pszStr, const char *pszBreakChars)
 # endif
 #elif defined(__WATCOMC__)
-_WCRTLINK char *std::strpbrk(const char *pszStr, const char *pszChars)
+_WCRTLINK char *std::strpbrk(const char *pszStr, const char *pszBreakChars)
 #else
-char *strpbrk(const char *pszStr, const char *pszChars)
+char *strpbrk(const char *pszStr, const char *pszBreakChars)
 # if defined(__THROW) && !defined(RT_OS_WINDOWS) && !defined(RT_OS_OS2)
     __THROW
@@ -55 +57 @@
     while ((chCur = *pszStr++) != '\0')
     {
-        int ch;
-        const char *psz = pszChars;
-        while ((ch = *psz++) != '\0')
-            if (ch == chCur)
+        int chBreak;
+        const char *psz = pszBreakChars;
+        while ((chBreak = *psz++) != '\0')
+            if (chBreak == chCur)
                 return (char *)(pszStr - 1);