openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-27 23:22:37 +02:00
Code Issues Releases Wiki Activity

Move strtok_r implementation verbatim to helpers.c

Browse Source 
Corresponding to flashrom svn r1853.

Signed-off-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Acked-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
This commit is contained in:
Stefan Tauner 2014-11-01 22:56:06 +00:00
parent ff9e6c32c3
commit b41d847d72
3 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
flash.h
View File

@ -255,6 +255,9 @@ int max(int a, int b);
int min(int a, int b); int min(int a, int b);
char *strcat_realloc(char *dest, const char *src); char *strcat_realloc(char *dest, const char *src);
void tolower_string(char *str); void tolower_string(char *str);
#ifdef __MINGW32__
char* strtok_r(char *str, const char *delim, char **nextp);
#endif
/* flashrom.c */ /* flashrom.c */
extern const char flashrom_version[]; extern const char flashrom_version[];

21
helpers.c
View File

@ -70,3 +70,24 @@ void tolower_string(char *str)
*str = (char)tolower((unsigned char)*str); *str = (char)tolower((unsigned char)*str);
} }
/* FIXME: Find a better solution for MinGW. Maybe wrap strtok_s (C11) if it becomes available */
#ifdef __MINGW32__
char* strtok_r(char *str, const char *delim, char **nextp)
{
if (str == NULL)
str = *nextp;
str += strspn(str, delim); /* Skip leading delimiters */
if (*str == '\0')
return NULL;
char *ret = str;
str += strcspn(str, delim); /* Find end of token */
if (*str != '\0')
*str++ = '\0';
*nextp = str;
return ret;
}
#endif

21
print.c
View File

@ -26,27 +26,6 @@
#include "flash.h" #include "flash.h"
#include "programmer.h" #include "programmer.h"
/* FIXME: Find a better solution for MinGW. Maybe wrap strtok_s (C11) below if it becomes available */
#ifdef __MINGW32__
static char* strtok_r(char *str, const char *delim, char **nextp)
{
if (str == NULL)
str = *nextp;
str += strspn(str, delim); /* Skip leading delimiters */
if (*str == '\0')
return NULL;
char *ret = str;
str += strcspn(str, delim); /* Find end of token */
if (*str != '\0')
*str++ = '\0';
*nextp = str;
return ret;
}
#endif
static const char *test_state_to_text(enum test_state test_state) static const char *test_state_to_text(enum test_state test_state)
{ {
switch (test_state) { switch (test_state) {