re-indented to follow "project curl"-style, renamed curl_ prefix to Curl_ (88d536eb) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP curl

lib/strtok.c

+44 −53

Original line number	Diff line number	Diff line
		@@ -72,14 +72,13 @@
		#include <stddef.h>

		char *
		curl_strtok_r(char s, const char delim, char **last)
		Curl_strtok_r(char s, const char delim, char **last)
		{
		char *spanp;
		int c, sc;
		char *tok;

		if (s == NULL && (s = *last) == NULL)
		{
		if (s == NULL && (s = *last) == NULL) {
		return NULL;
		}

		@@ -88,16 +87,13 @@ curl_strtok_r(char s, const char delim, char **last)
		*/
		cont:
		c = *s++;
		for (spanp = (char )delim; (sc = spanp++) != 0; )
		{
		if (c == sc)
		{
		for (spanp = (char )delim; (sc = spanp++) != 0; ) {
		if (c == sc) {
		goto cont;
		}
		}

		if (c == 0) /* no non-delimiter characters */
		{
		if (c == 0) { /* no non-delimiter characters */
		*last = NULL;
		return NULL;
		}
		@@ -107,20 +103,15 @@ cont:
		* 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.
		*/
		for (;;)
		{
		for (;;) {
		c = *s++;
		spanp = (char *)delim;
		do
		{
		if ((sc = *spanp++) == c)
		{
		if (c == 0)
		{
		do {
		if ((sc = *spanp++) == c) {
		if (c == 0) {
		s = NULL;
		}
		else
		{
		else {
		char *w = s - 1;
		*w = '\0';
		}