Changeset 95767 in vbox for trunk/src/VBox/Runtime/common/string

Timestamp:

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

Author:

vboxsync

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

File:

• trunk/src/VBox/Runtime/common/string/strpbrk.cpp (modified) (2 diffs)

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);