moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

re-indented to follow "project curl"-style, renamed curl_ prefix to Curl_

This commit is contained in:
Daniel Stenberg 2001-05-29 19:20:21 +00:00
parent d567659bf4
commit 88d536eb3b
1 changed files with 44 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lib/strtok.c
View File

@ -72,14 +72,13 @@
#include <stddef.h> #include <stddef.h>
char * char *
curl_strtok_r(char *s, const char *delim, char **last) Curl_strtok_r(char *s, const char *delim, char **last)
{ {
char *spanp; char *spanp;
int c, sc; int c, sc;
char *tok; char *tok;
if (s == NULL && (s = *last) == NULL) if (s == NULL && (s = *last) == NULL) {
{
return NULL; return NULL;
} }
@ -88,16 +87,13 @@ curl_strtok_r(char *s, const char *delim, char **last)
*/ */
cont: cont:
c = *s++; c = *s++;
for (spanp = (char *)delim; (sc = *spanp++) != 0; ) for (spanp = (char *)delim; (sc = *spanp++) != 0; ) {
{ if (c == sc) {
if (c == sc)
{
goto cont; goto cont;
} }
} }
if (c == 0) /* no non-delimiter characters */ if (c == 0) { /* no non-delimiter characters */
{
*last = NULL; *last = NULL;
return NULL; return NULL;
} }
@ -107,20 +103,15 @@ cont:
* Scan token (scan for delimiters: s += strcspn(s, delim), sort of). * Scan token (scan for delimiters: s += strcspn(s, delim), sort of).
* Note that delim must have one NUL; we stop if we see that, too. * Note that delim must have one NUL; we stop if we see that, too.
*/ */
for (;;) for (;;) {
{
c = *s++; c = *s++;
spanp = (char *)delim; spanp = (char *)delim;
do do {
{ if ((sc = *spanp++) == c) {
if ((sc = *spanp++) == c) if (c == 0) {
{
if (c == 0)
{
s = NULL; s = NULL;
} }
else else {
{
char *w = s - 1; char *w = s - 1;
*w = '\0'; *w = '\0';
} }