AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-11-22 17:39:53 +03:00
Code Releases Activity

Internat.c: use correct wcstok() signature (3 arguments)

Browse Source 
The wcstok() function uses the standard signature since Visual Studio 2015.
This commit is contained in:
Davide Beatrici 2018-07-29 09:56:47 +02:00
parent e720cf657b
commit ee383994f0
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Mayaqua/Internat.c
View File

@ -2201,9 +2201,9 @@ UNI_TOKEN_LIST *UniParseToken(wchar_t *src, wchar_t *separator)
wchar_t *str1, *str2; wchar_t *str1, *str2;
UINT len, num; UINT len, num;
#ifdef OS_UNIX #if (!defined _MSC_VER) || (_MSC_VER >= 1900)
wchar_t *state = NULL; wchar_t *state = NULL;
#endif // OS_UNIX #endif // (!defined _MSC_VER) || (_MSC_VER >= 1900)
// Validate arguments // Validate arguments
if (src == NULL) if (src == NULL)
@ -2225,18 +2225,18 @@ UNI_TOKEN_LIST *UniParseToken(wchar_t *src, wchar_t *separator)
Lock(token_lock); Lock(token_lock);
{ {
tmp = wcstok(str1, separator tmp = wcstok(str1, separator
#ifdef OS_UNIX #if (!defined _MSC_VER) || (_MSC_VER >= 1900)
, &state , &state
#endif // OS_UNIX #endif // (!defined _MSC_VER) || (_MSC_VER >= 1900)
); );
num = 0; num = 0;
while (tmp != NULL) while (tmp != NULL)
{ {
num++; num++;
tmp = wcstok(NULL, separator tmp = wcstok(NULL, separator
#ifdef OS_UNIX #if (!defined _MSC_VER) || (_MSC_VER >= 1900)
, &state , &state
#endif // OS_UNIX #endif // (!defined _MSC_VER) || (_MSC_VER >= 1900)
); );
} }
ret = Malloc(sizeof(UNI_TOKEN_LIST)); ret = Malloc(sizeof(UNI_TOKEN_LIST));
@ -2244,9 +2244,9 @@ UNI_TOKEN_LIST *UniParseToken(wchar_t *src, wchar_t *separator)
ret->Token = (wchar_t **)Malloc(sizeof(wchar_t *) * num); ret->Token = (wchar_t **)Malloc(sizeof(wchar_t *) * num);
num = 0; num = 0;
tmp = wcstok(str2, separator tmp = wcstok(str2, separator
#ifdef OS_UNIX #if (!defined _MSC_VER) || (_MSC_VER >= 1900)
, &state , &state
#endif // OS_UNIX #endif // (!defined _MSC_VER) || (_MSC_VER >= 1900)
); );
while (tmp != NULL) while (tmp != NULL)
{ {
@ -2254,9 +2254,9 @@ UNI_TOKEN_LIST *UniParseToken(wchar_t *src, wchar_t *separator)
UniStrCpy(ret->Token[num], 0, tmp); UniStrCpy(ret->Token[num], 0, tmp);
num++; num++;
tmp = wcstok(NULL, separator tmp = wcstok(NULL, separator
#ifdef OS_UNIX #if (!defined _MSC_VER) || (_MSC_VER >= 1900)
, &state , &state
#endif // OS_UNIX #endif // (!defined _MSC_VER) || (_MSC_VER >= 1900)
); );
} }
} }