mirror of
https://github.com/moparisthebest/curl
synced 2024-11-17 15:05:02 -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.
128 lines
3.3 KiB
C
128 lines
3.3 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) 1998 - 2011, 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"
|
|
|
|
#include "curl_memory.h"
|
|
#include "slist.h"
|
|
|
|
/* The last #include file should be: */
|
|
#include "memdebug.h"
|
|
|
|
/* returns last node in linked list */
|
|
static struct curl_slist *slist_get_last(struct curl_slist *list)
|
|
{
|
|
struct curl_slist *item;
|
|
|
|
/* if caller passed us a NULL, return now */
|
|
if(!list)
|
|
return NULL;
|
|
|
|
/* loop through to find the last item */
|
|
item = list;
|
|
while(item->next) {
|
|
item = item->next;
|
|
}
|
|
return item;
|
|
}
|
|
|
|
/*
|
|
* curl_slist_append() appends a string to the linked list. It always returns
|
|
* the address of the first record, so that you can use this function as an
|
|
* initialization function as well as an append function. If you find this
|
|
* bothersome, then simply create a separate _init function and call it
|
|
* appropriately from within the program.
|
|
*/
|
|
struct curl_slist *curl_slist_append(struct curl_slist *list,
|
|
const char *data)
|
|
{
|
|
struct curl_slist *last;
|
|
struct curl_slist *new_item;
|
|
|
|
new_item = malloc(sizeof(struct curl_slist));
|
|
if(new_item) {
|
|
char *dupdata = strdup(data);
|
|
if(dupdata) {
|
|
new_item->next = NULL;
|
|
new_item->data = dupdata;
|
|
}
|
|
else {
|
|
free(new_item);
|
|
return NULL;
|
|
}
|
|
}
|
|
else
|
|
return NULL;
|
|
|
|
if(list) {
|
|
last = slist_get_last(list);
|
|
last->next = new_item;
|
|
return list;
|
|
}
|
|
|
|
/* if this is the first item, then new_item *is* the list */
|
|
return new_item;
|
|
}
|
|
|
|
/*
|
|
* Curl_slist_duplicate() duplicates a linked list. It always returns the
|
|
* address of the first record of the cloned list or NULL in case of an
|
|
* error (or if the input list was NULL).
|
|
*/
|
|
struct curl_slist *Curl_slist_duplicate(struct curl_slist *inlist)
|
|
{
|
|
struct curl_slist *outlist = NULL;
|
|
struct curl_slist *tmp;
|
|
|
|
while(inlist) {
|
|
tmp = curl_slist_append(outlist, inlist->data);
|
|
|
|
if(!tmp) {
|
|
curl_slist_free_all(outlist);
|
|
return NULL;
|
|
}
|
|
|
|
outlist = tmp;
|
|
inlist = inlist->next;
|
|
}
|
|
return outlist;
|
|
}
|
|
|
|
/* be nice and clean up resources */
|
|
void curl_slist_free_all(struct curl_slist *list)
|
|
{
|
|
struct curl_slist *next;
|
|
struct curl_slist *item;
|
|
|
|
if(!list)
|
|
return;
|
|
|
|
item = list;
|
|
do {
|
|
next = item->next;
|
|
Curl_safefree(item->data);
|
|
free(item);
|
|
item = next;
|
|
} while(next);
|
|
}
|
|
|