summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Wilgus <wilgus.william@gmail.com>2022-11-12 08:22:01 -0500
committerWilliam Wilgus <me.theuser@yahoo.com>2022-11-20 23:37:20 -0500
commiteb9b3513faa0d7e5bc2d7bb9ed098801191af1d8 (patch)
treedb60b3a7ccab61301a1dfa74aabdb823d17a287e
parent0661784469c7e903528c1820f94a67c6de69a77f (diff)
downloadrockbox-eb9b3513fa.tar.gz
rockbox-eb9b3513fa.zip
Remove strtok_r.c
strtokspn emulates the original libc function Change-Id: Ie6cd033ebf5d4f78ce4462f19bfb8ffb16d04ae1
-rw-r--r--firmware/SOURCES4
-rw-r--r--firmware/libc/strtok.c63
2 files changed, 0 insertions, 67 deletions
diff --git a/firmware/SOURCES b/firmware/SOURCES
index b13a5ac304..84c60b1d97 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -208,7 +208,6 @@ target/hosted/maemo/maemo-thread.c
/* Common */
#ifndef BOOTLOADER
common/strptokspn.c
-#define HAVE_STRTOK_R
common/ap_int.c
#endif
common/version.c
@@ -250,9 +249,6 @@ common/adler32.c
common/inflate.c
/* Standard library */
-#if (CONFIG_PLATFORM & PLATFORM_NATIVE) || defined(__MINGW32__) || defined(__CYGWIN__)
-libc/strtok.c
-#endif /* PLATFORM_NATIVE || __MINGW32__ || __CYGWIN__ */
#if (CONFIG_PLATFORM & PLATFORM_NATIVE) || defined(HAVE_ROCKBOX_C_LIBRARY)
libc/atoi.c
libc/errno.c
diff --git a/firmware/libc/strtok.c b/firmware/libc/strtok.c
deleted file mode 100644
index 9e2eddf599..0000000000
--- a/firmware/libc/strtok.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/***************************************************************************
- * __________ __ ___.
- * Open \______ \ ____ ____ | | _\_ |__ _______ ___
- * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
- * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
- * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
- * \/ \/ \/ \/ \/
- * $Id$
- *
- * Copyright (C) 2002 by Daniel Stenberg
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied. *
- ****************************************************************************/
-
-#include "config.h"
-
-#ifndef HAVE_STRTOK_R
-#include <stddef.h>
-#include <string.h>
-
-char *
-strtok_r(char *ptr, const char *sep, char **end)
-{
- if (!ptr)
- /* we got NULL input so then we get our last position instead */
- ptr = *end;
-
- /* pass all letters that are including in the separator string */
- while (*ptr && strchr(sep, *ptr))
- ++ptr;
-
- if (*ptr) {
- /* so this is where the next piece of string starts */
- char *start = ptr;
-
- /* set the end pointer to the first byte after the start */
- *end = start + 1;
-
- /* scan through the string to find where it ends, it ends on a
- null byte or a character that exists in the separator string */
- while (**end && !strchr(sep, **end))
- ++*end;
-
- if (**end) {
- /* the end is not a null byte */
- **end = '\0'; /* zero terminate it! */
- ++*end; /* advance last pointer to beyond the null byte */
- }
-
- return start; /* return the position where the string starts */
- }
-
- /* we ended up on a null byte, there are no more strings to find! */
- return NULL;
-}
-
-#endif /* this was only compiled if strtok_r wasn't present */