summaryrefslogtreecommitdiff
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-eb9b3513faa0d7e5bc2d7bb9ed098801191af1d8.tar.gz
rockbox-eb9b3513faa0d7e5bc2d7bb9ed098801191af1d8.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
208/* Common */ 208/* Common */
209#ifndef BOOTLOADER 209#ifndef BOOTLOADER
210common/strptokspn.c 210common/strptokspn.c
211#define HAVE_STRTOK_R
212common/ap_int.c 211common/ap_int.c
213#endif 212#endif
214common/version.c 213common/version.c
@@ -250,9 +249,6 @@ common/adler32.c
250common/inflate.c 249common/inflate.c
251 250
252/* Standard library */ 251/* Standard library */
253#if (CONFIG_PLATFORM & PLATFORM_NATIVE) || defined(__MINGW32__) || defined(__CYGWIN__)
254libc/strtok.c
255#endif /* PLATFORM_NATIVE || __MINGW32__ || __CYGWIN__ */
256#if (CONFIG_PLATFORM & PLATFORM_NATIVE) || defined(HAVE_ROCKBOX_C_LIBRARY) 252#if (CONFIG_PLATFORM & PLATFORM_NATIVE) || defined(HAVE_ROCKBOX_C_LIBRARY)
257libc/atoi.c 253libc/atoi.c
258libc/errno.c 254libc/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 @@
1/***************************************************************************
2 * __________ __ ___.
3 * Open \______ \ ____ ____ | | _\_ |__ _______ ___
4 * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
5 * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
6 * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
7 * \/ \/ \/ \/ \/
8 * $Id$
9 *
10 * Copyright (C) 2002 by Daniel Stenberg
11 *
12 * This program is free software; you can redistribute it and/or
13 * modify it under the terms of the GNU General Public License
14 * as published by the Free Software Foundation; either version 2
15 * of the License, or (at your option) any later version.
16 *
17 * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
18 * KIND, either express or implied. *
19 ****************************************************************************/
20
21#include "config.h"
22
23#ifndef HAVE_STRTOK_R
24#include <stddef.h>
25#include <string.h>
26
27char *
28strtok_r(char *ptr, const char *sep, char **end)
29{
30 if (!ptr)
31 /* we got NULL input so then we get our last position instead */
32 ptr = *end;
33
34 /* pass all letters that are including in the separator string */
35 while (*ptr && strchr(sep, *ptr))
36 ++ptr;
37
38 if (*ptr) {
39 /* so this is where the next piece of string starts */
40 char *start = ptr;
41
42 /* set the end pointer to the first byte after the start */
43 *end = start + 1;
44
45 /* scan through the string to find where it ends, it ends on a
46 null byte or a character that exists in the separator string */
47 while (**end && !strchr(sep, **end))
48 ++*end;
49
50 if (**end) {
51 /* the end is not a null byte */
52 **end = '\0'; /* zero terminate it! */
53 ++*end; /* advance last pointer to beyond the null byte */
54 }
55
56 return start; /* return the position where the string starts */
57 }
58
59 /* we ended up on a null byte, there are no more strings to find! */
60 return NULL;
61}
62
63#endif /* this was only compiled if strtok_r wasn't present */