feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

move XSTRTOK to STRING_USER where it belongs

Browse Source
This commit is contained in:
toddouska
2015-09-14 13:00:26 -07:00
parent 0ecd6435e9
commit d8905a0110
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
wolfssl/wolfcrypt/types.h
View File

@@ -189,15 +189,6 @@
#define XREALLOC(p, n, h, t) wolfSSL_Realloc((p), (n)) #define XREALLOC(p, n, h, t) wolfSSL_Realloc((p), (n))
#endif #endif
#ifdef WOLFSSL_CERT_EXT
/* use only Thread Safe version of strtok */
#ifndef USE_WINDOWS_API
#define XSTRTOK strtok_r
#else
#define XSTRTOK strtok_s
#endif
#endif
#ifndef STRING_USER #ifndef STRING_USER
#include <string.h> #include <string.h>
char* mystrnstr(const char* s1, const char* s2, unsigned int n); char* mystrnstr(const char* s1, const char* s2, unsigned int n);
@@ -209,8 +200,8 @@
#define XSTRLEN(s1) strlen((s1)) #define XSTRLEN(s1) strlen((s1))
#define XSTRNCPY(s1,s2,n) strncpy((s1),(s2),(n)) #define XSTRNCPY(s1,s2,n) strncpy((s1),(s2),(n))
/* strstr, strncmp, and strncat only used by wolfSSL proper, not required for /* strstr, strncmp, and strncat only used by wolfSSL proper,
CTaoCrypt only */ * not required for wolfCrypt only */
#define XSTRSTR(s1,s2) strstr((s1),(s2)) #define XSTRSTR(s1,s2) strstr((s1),(s2))
#define XSTRNSTR(s1,s2,n) mystrnstr((s1),(s2),(n)) #define XSTRNSTR(s1,s2,n) mystrnstr((s1),(s2),(n))
#define XSTRNCMP(s1,s2,n) strncmp((s1),(s2),(n)) #define XSTRNCMP(s1,s2,n) strncmp((s1),(s2),(n))
@@ -220,6 +211,15 @@
#else #else
#define XSTRNCASECMP(s1,s2,n) _strnicmp((s1),(s2),(n)) #define XSTRNCASECMP(s1,s2,n) _strnicmp((s1),(s2),(n))
#endif #endif
#ifdef WOLFSSL_CERT_EXT
/* use only Thread Safe version of strtok */
#ifndef USE_WINDOWS_API
#define XSTRTOK strtok_r
#else
#define XSTRTOK strtok_s
#endif
#endif
#endif #endif
#ifndef CTYPE_USER #ifndef CTYPE_USER