mirror of
https://github.com/moparisthebest/curl
synced 2024-11-15 22:15:13 -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.
111 lines
3.0 KiB
C
111 lines
3.0 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) 2012, Linus Nielsen Feltzing, <linus@haxx.se>
|
|
* Copyright (C) 2012, 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/curl.h>
|
|
|
|
#include "urldata.h"
|
|
#include "url.h"
|
|
#include "progress.h"
|
|
#include "multiif.h"
|
|
#include "bundles.h"
|
|
#include "sendf.h"
|
|
#include "rawstr.h"
|
|
|
|
#include "curl_memory.h"
|
|
/* The last #include file should be: */
|
|
#include "memdebug.h"
|
|
|
|
static void conn_llist_dtor(void *user, void *element)
|
|
{
|
|
struct connectdata *data = element;
|
|
(void)user;
|
|
|
|
data->bundle = NULL;
|
|
}
|
|
|
|
CURLcode Curl_bundle_create(struct SessionHandle *data,
|
|
struct connectbundle **cb_ptr)
|
|
{
|
|
(void)data;
|
|
DEBUGASSERT(*cb_ptr == NULL);
|
|
*cb_ptr = malloc(sizeof(struct connectbundle));
|
|
if(!*cb_ptr)
|
|
return CURLE_OUT_OF_MEMORY;
|
|
|
|
(*cb_ptr)->num_connections = 0;
|
|
(*cb_ptr)->server_supports_pipelining = FALSE;
|
|
|
|
(*cb_ptr)->conn_list = Curl_llist_alloc((curl_llist_dtor) conn_llist_dtor);
|
|
if(!(*cb_ptr)->conn_list) {
|
|
Curl_safefree(*cb_ptr);
|
|
return CURLE_OUT_OF_MEMORY;
|
|
}
|
|
return CURLE_OK;
|
|
}
|
|
|
|
void Curl_bundle_destroy(struct connectbundle *cb_ptr)
|
|
{
|
|
if(!cb_ptr)
|
|
return;
|
|
|
|
if(cb_ptr->conn_list) {
|
|
Curl_llist_destroy(cb_ptr->conn_list, NULL);
|
|
cb_ptr->conn_list = NULL;
|
|
}
|
|
Curl_safefree(cb_ptr);
|
|
}
|
|
|
|
/* Add a connection to a bundle */
|
|
CURLcode Curl_bundle_add_conn(struct connectbundle *cb_ptr,
|
|
struct connectdata *conn)
|
|
{
|
|
if(!Curl_llist_insert_next(cb_ptr->conn_list, cb_ptr->conn_list->tail, conn))
|
|
return CURLE_OUT_OF_MEMORY;
|
|
|
|
conn->bundle = cb_ptr;
|
|
|
|
cb_ptr->num_connections++;
|
|
return CURLE_OK;
|
|
}
|
|
|
|
/* Remove a connection from a bundle */
|
|
int Curl_bundle_remove_conn(struct connectbundle *cb_ptr,
|
|
struct connectdata *conn)
|
|
{
|
|
struct curl_llist_element *curr;
|
|
|
|
curr = cb_ptr->conn_list->head;
|
|
while(curr) {
|
|
if(curr->ptr == conn) {
|
|
Curl_llist_remove(cb_ptr->conn_list, curr, NULL);
|
|
cb_ptr->num_connections--;
|
|
conn->bundle = NULL;
|
|
return 1; /* we removed a handle */
|
|
}
|
|
curr = curr->next;
|
|
}
|
|
return 0;
|
|
}
|