diff options
author | stefanct <stefanct@2b7e53f0-3cfb-0310-b3e9-8179ed1497e1> | 2014-11-01 22:56:06 +0000 |
---|---|---|
committer | stefanct <stefanct@2b7e53f0-3cfb-0310-b3e9-8179ed1497e1> | 2014-11-01 22:56:06 +0000 |
commit | ca7b823b13b700d3b92653c9c697084469426fc5 (patch) | |
tree | 7645efab7c6eb3a470e51ade1c88f62b00569eb9 | |
parent | 4c94fea93d22fec409fe5f6ae88869ca6575f510 (diff) | |
download | flashrom-ca7b823b13b700d3b92653c9c697084469426fc5.tar.gz |
Move strtok_r implementation verbatim to helpers.c.
Signed-off-by: Stefan Tauner <stefan.tauner@student.tuwien.ac.at>
Acked-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
git-svn-id: https://code.coreboot.org/svn/flashrom/trunk@1853 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
-rw-r--r-- | flash.h | 3 | ||||
-rw-r--r-- | helpers.c | 21 | ||||
-rw-r--r-- | print.c | 21 |
3 files changed, 24 insertions, 21 deletions
@@ -255,6 +255,9 @@ int max(int a, int b); int min(int a, int b); char *strcat_realloc(char *dest, const char *src); void tolower_string(char *str); +#ifdef __MINGW32__ +char* strtok_r(char *str, const char *delim, char **nextp); +#endif /* flashrom.c */ extern const char flashrom_version[]; @@ -70,3 +70,24 @@ void tolower_string(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 + @@ -26,27 +26,6 @@ #include "flash.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) { switch (test_state) { |