mirror of
https://github.com/moparisthebest/curl
synced 2024-11-17 23:15:08 -05:00
5a053ffe80
This commit renames lib/setup.h to lib/curl_setup.h and
renames lib/setup_once.h to lib/curl_setup_once.h.
Removes the need and usage of a header inclusion guard foreign
to libcurl. [1]
Removes the need and presence of an alarming notice we carried
in old setup_once.h [2]
----------------------------------------
1 - lib/setup_once.h used __SETUP_ONCE_H macro as header inclusion guard
up to commit ec691ca3 which changed this to HEADER_CURL_SETUP_ONCE_H,
this single inclusion guard is enough to ensure that inclusion of
lib/setup_once.h done from lib/setup.h is only done once.
Additionally lib/setup.h has always used __SETUP_ONCE_H macro to
protect inclusion of setup_once.h even after commit ec691ca3, this
was to avoid a circular header inclusion triggered when building a
c-ares enabled version with c-ares sources available which also has
a setup_once.h header. Commit ec691ca3 exposes the real nature of
__SETUP_ONCE_H usage in lib/setup.h, it is a header inclusion guard
foreign to libcurl belonging to c-ares's setup_once.h
The renaming this commit does, fixes the circular header inclusion,
and as such removes the need and usage of a header inclusion guard
foreign to libcurl. Macro __SETUP_ONCE_H no longer used in libcurl.
2 - Due to the circular interdependency of old lib/setup_once.h and the
c-ares setup_once.h header, old file lib/setup_once.h has carried
back from 2006 up to now days an alarming and prominent notice about
the need of keeping libcurl's and c-ares's setup_once.h in sync.
Given that this commit fixes the circular interdependency, the need
and presence of mentioned notice is removed.
All mentioned interdependencies come back from now old days when
the c-ares project lived inside a curl subdirectory. This commit
removes last traces of such fact.
67 lines
2.1 KiB
C
67 lines
2.1 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
*
|
|
* This software is licensed as described in the file COPYING, which
|
|
* you should have received as part of this distribution. The terms
|
|
* are also available at http://curl.haxx.se/docs/copyright.html.
|
|
*
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
***************************************************************************/
|
|
|
|
#include "curl_setup.h"
|
|
|
|
#ifndef HAVE_STRTOK_R
|
|
#include <stddef.h>
|
|
|
|
#include "strtok.h"
|
|
|
|
char *
|
|
Curl_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 the 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 */
|