AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2025-04-03 18:00:08 +03:00
Code Releases Activity

Remove token_lock in ParseToken

Browse Source
This commit is contained in:
Takuho NAKANO 2020-07-19 15:13:19 +09:00
parent 97e0788c61
commit 54e583a8f6
1 changed files with 30 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/Mayaqua/Str.c
View File

@ -2403,45 +2403,41 @@ TOKEN_LIST *ParseToken(char *src, char *separator)
StrCpy(str1, 0, src);
StrCpy(str2, 0, src);
Lock(token_lock);
#if (defined _MSC_VER)
tmp = strtok_s(str1, separator, &strtok_save);
#else
tmp = strtok_r(str1, separator, &strtok_save);
#endif // (defined _MSC_VER)
num = 0;
while (tmp != NULL)
{
num++;
#if (defined _MSC_VER)
tmp = strtok_s(str1, separator, &strtok_save);
tmp = strtok_s(NULL, separator, &strtok_save);
#else
tmp = strtok_r(str1, separator, &strtok_save);
tmp = strtok_r(NULL, separator, &strtok_save);
#endif // (defined _MSC_VER)
}
ret = Malloc(sizeof(TOKEN_LIST));
ret->NumTokens = num;
ret->Token = (char **)Malloc(sizeof(char *) * num);
num = 0;
#if (defined _MSC_VER)
tmp = strtok_s(str2, separator, &strtok_save);
#else
tmp = strtok_r(str2, separator, &strtok_save);
#endif // (defined _MSC_VER)
while (tmp != NULL)
{
ret->Token[num] = (char *)Malloc(StrLen(tmp) + 1);
StrCpy(ret->Token[num], 0, tmp);
num++;
#if (defined _MSC_VER)
tmp = strtok_s(NULL, separator, &strtok_save);
#else
tmp = strtok_r(NULL, separator, &strtok_save);
#endif // (defined _MSC_VER)
num = 0;
while (tmp != NULL)
{
num++;
#if (defined _MSC_VER)
tmp = strtok_s(NULL, separator, &strtok_save);
#else
tmp = strtok_r(NULL, separator, &strtok_save);
#endif // (defined _MSC_VER)
}
ret = Malloc(sizeof(TOKEN_LIST));
ret->NumTokens = num;
ret->Token = (char **)Malloc(sizeof(char *) * num);
num = 0;
#if (defined _MSC_VER)
tmp = strtok_s(str2, separator, &strtok_save);
#else
tmp = strtok_r(str2, separator, &strtok_save);
#endif // (defined _MSC_VER)
while (tmp != NULL)
{
ret->Token[num] = (char *)Malloc(StrLen(tmp) + 1);
StrCpy(ret->Token[num], 0, tmp);
num++;
#if (defined _MSC_VER)
tmp = strtok_s(NULL, separator, &strtok_save);
#else
tmp = strtok_r(NULL, separator, &strtok_save);
#endif // (defined _MSC_VER)
}
}
Unlock(token_lock);
Free(str1);
Free(str2);