mirror of
https://github.com/curl/curl.git
synced 2025-02-11 14:50:40 +08:00
llist: make it "struct Curl_llist"
As internal global names should use captical C. Closes #5906
This commit is contained in:
parent
8bdc4f8aee
commit
9b3f888a00
16
lib/altsvc.c
16
lib/altsvc.c
@ -304,8 +304,8 @@ CURLcode Curl_altsvc_ctrl(struct altsvcinfo *asi, const long ctrl)
|
||||
*/
|
||||
void Curl_altsvc_cleanup(struct altsvcinfo *altsvc)
|
||||
{
|
||||
struct curl_llist_element *e;
|
||||
struct curl_llist_element *n;
|
||||
struct Curl_llist_element *e;
|
||||
struct Curl_llist_element *n;
|
||||
if(altsvc) {
|
||||
for(e = altsvc->list.head; e; e = n) {
|
||||
struct altsvc *as = e->ptr;
|
||||
@ -323,8 +323,8 @@ void Curl_altsvc_cleanup(struct altsvcinfo *altsvc)
|
||||
CURLcode Curl_altsvc_save(struct Curl_easy *data,
|
||||
struct altsvcinfo *altsvc, const char *file)
|
||||
{
|
||||
struct curl_llist_element *e;
|
||||
struct curl_llist_element *n;
|
||||
struct Curl_llist_element *e;
|
||||
struct Curl_llist_element *n;
|
||||
CURLcode result = CURLE_OK;
|
||||
FILE *out;
|
||||
char *tempstore;
|
||||
@ -399,8 +399,8 @@ static CURLcode getalnum(const char **ptr, char *alpnbuf, size_t buflen)
|
||||
static void altsvc_flush(struct altsvcinfo *asi, enum alpnid srcalpnid,
|
||||
const char *srchost, unsigned short srcport)
|
||||
{
|
||||
struct curl_llist_element *e;
|
||||
struct curl_llist_element *n;
|
||||
struct Curl_llist_element *e;
|
||||
struct Curl_llist_element *n;
|
||||
for(e = asi->list.head; e; e = n) {
|
||||
struct altsvc *as = e->ptr;
|
||||
n = e->next;
|
||||
@ -612,8 +612,8 @@ bool Curl_altsvc_lookup(struct altsvcinfo *asi,
|
||||
struct altsvc **dstentry,
|
||||
const int versions) /* one or more bits */
|
||||
{
|
||||
struct curl_llist_element *e;
|
||||
struct curl_llist_element *n;
|
||||
struct Curl_llist_element *e;
|
||||
struct Curl_llist_element *n;
|
||||
time_t now = time(NULL);
|
||||
DEBUGASSERT(asi);
|
||||
DEBUGASSERT(srchost);
|
||||
|
@ -46,12 +46,12 @@ struct altsvc {
|
||||
time_t expires;
|
||||
bool persist;
|
||||
int prio;
|
||||
struct curl_llist_element node;
|
||||
struct Curl_llist_element node;
|
||||
};
|
||||
|
||||
struct altsvcinfo {
|
||||
char *filename;
|
||||
struct curl_llist list; /* list of entries */
|
||||
struct Curl_llist list; /* list of entries */
|
||||
long flags; /* the publicly set bitmask */
|
||||
};
|
||||
|
||||
|
@ -59,7 +59,7 @@ static CURLcode bundle_create(struct connectbundle **bundlep)
|
||||
(*bundlep)->num_connections = 0;
|
||||
(*bundlep)->multiuse = BUNDLE_UNKNOWN;
|
||||
|
||||
Curl_llist_init(&(*bundlep)->conn_list, (curl_llist_dtor) conn_llist_dtor);
|
||||
Curl_llist_init(&(*bundlep)->conn_list, (Curl_llist_dtor) conn_llist_dtor);
|
||||
return CURLE_OK;
|
||||
}
|
||||
|
||||
@ -87,7 +87,7 @@ static void bundle_add_conn(struct connectbundle *bundle,
|
||||
static int bundle_remove_conn(struct connectbundle *bundle,
|
||||
struct connectdata *conn)
|
||||
{
|
||||
struct curl_llist_element *curr;
|
||||
struct Curl_llist_element *curr;
|
||||
|
||||
curr = bundle->conn_list.head;
|
||||
while(curr) {
|
||||
@ -321,7 +321,7 @@ bool Curl_conncache_foreach(struct Curl_easy *data,
|
||||
int (*func)(struct connectdata *conn, void *param))
|
||||
{
|
||||
struct curl_hash_iterator iter;
|
||||
struct curl_llist_element *curr;
|
||||
struct Curl_llist_element *curr;
|
||||
struct curl_hash_element *he;
|
||||
|
||||
if(!connc)
|
||||
@ -371,7 +371,7 @@ conncache_find_first_connection(struct conncache *connc)
|
||||
|
||||
he = Curl_hash_next_element(&iter);
|
||||
while(he) {
|
||||
struct curl_llist_element *curr;
|
||||
struct Curl_llist_element *curr;
|
||||
bundle = he->ptr;
|
||||
|
||||
curr = bundle->conn_list.head;
|
||||
@ -429,7 +429,7 @@ struct connectdata *
|
||||
Curl_conncache_extract_bundle(struct Curl_easy *data,
|
||||
struct connectbundle *bundle)
|
||||
{
|
||||
struct curl_llist_element *curr;
|
||||
struct Curl_llist_element *curr;
|
||||
timediff_t highscore = -1;
|
||||
timediff_t score;
|
||||
struct curltime now;
|
||||
@ -478,7 +478,7 @@ Curl_conncache_extract_oldest(struct Curl_easy *data)
|
||||
{
|
||||
struct conncache *connc = data->state.conn_cache;
|
||||
struct curl_hash_iterator iter;
|
||||
struct curl_llist_element *curr;
|
||||
struct Curl_llist_element *curr;
|
||||
struct curl_hash_element *he;
|
||||
timediff_t highscore =- 1;
|
||||
timediff_t score;
|
||||
@ -572,7 +572,7 @@ void Curl_conncache_close_all_connections(struct conncache *connc)
|
||||
void Curl_conncache_print(struct conncache *connc)
|
||||
{
|
||||
struct curl_hash_iterator iter;
|
||||
struct curl_llist_element *curr;
|
||||
struct Curl_llist_element *curr;
|
||||
struct curl_hash_element *he;
|
||||
|
||||
if(!connc)
|
||||
|
@ -66,7 +66,7 @@ struct conncache {
|
||||
struct connectbundle {
|
||||
int multiuse; /* supports multi-use */
|
||||
size_t num_connections; /* Number of connections in the bundle */
|
||||
struct curl_llist conn_list; /* The connectdata members of the bundle */
|
||||
struct Curl_llist conn_list; /* The connectdata members of the bundle */
|
||||
};
|
||||
|
||||
/* returns 1 on error, 0 is fine */
|
||||
|
@ -7,7 +7,7 @@
|
||||
* | (__| |_| | _ <| |___
|
||||
* \___|\___/|_| \_\_____|
|
||||
*
|
||||
* Copyright (C) 2010 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.
|
||||
* Copyright (C) 2010 - 2020, 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
|
||||
@ -27,7 +27,7 @@
|
||||
|
||||
struct fileinfo {
|
||||
struct curl_fileinfo info;
|
||||
struct curl_llist_element list;
|
||||
struct Curl_llist_element list;
|
||||
};
|
||||
|
||||
struct fileinfo *Curl_fileinfo_alloc(void);
|
||||
|
@ -5,7 +5,7 @@
|
||||
* | (__| |_| | _ <| |___
|
||||
* \___|\___/|_| \_\_____|
|
||||
*
|
||||
* Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.
|
||||
* Copyright (C) 1998 - 2020, 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
|
||||
@ -274,7 +274,7 @@ static CURLcode ftp_pl_insert_finfo(struct connectdata *conn,
|
||||
curl_fnmatch_callback compare;
|
||||
struct WildcardData *wc = &conn->data->wildcard;
|
||||
struct ftp_wc *ftpwc = wc->protdata;
|
||||
struct curl_llist *llist = &wc->filelist;
|
||||
struct Curl_llist *llist = &wc->filelist;
|
||||
struct ftp_parselist_data *parser = ftpwc->parser;
|
||||
bool add = TRUE;
|
||||
struct curl_fileinfo *finfo = &infop->info;
|
||||
|
26
lib/hash.c
26
lib/hash.c
@ -5,7 +5,7 @@
|
||||
* | (__| |_| | _ <| |___
|
||||
* \___|\___/|_| \_\_____|
|
||||
*
|
||||
* Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.
|
||||
* Copyright (C) 1998 - 2020, 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
|
||||
@ -70,11 +70,11 @@ Curl_hash_init(struct curl_hash *h,
|
||||
h->size = 0;
|
||||
h->slots = slots;
|
||||
|
||||
h->table = malloc(slots * sizeof(struct curl_llist));
|
||||
h->table = malloc(slots * sizeof(struct Curl_llist));
|
||||
if(h->table) {
|
||||
int i;
|
||||
for(i = 0; i < slots; ++i)
|
||||
Curl_llist_init(&h->table[i], (curl_llist_dtor) hash_element_dtor);
|
||||
Curl_llist_init(&h->table[i], (Curl_llist_dtor) hash_element_dtor);
|
||||
return 0; /* fine */
|
||||
}
|
||||
h->slots = 0;
|
||||
@ -109,8 +109,8 @@ void *
|
||||
Curl_hash_add(struct curl_hash *h, void *key, size_t key_len, void *p)
|
||||
{
|
||||
struct curl_hash_element *he;
|
||||
struct curl_llist_element *le;
|
||||
struct curl_llist *l = FETCH_LIST(h, key, key_len);
|
||||
struct Curl_llist_element *le;
|
||||
struct Curl_llist *l = FETCH_LIST(h, key, key_len);
|
||||
|
||||
for(le = l->head; le; le = le->next) {
|
||||
he = (struct curl_hash_element *) le->ptr;
|
||||
@ -138,8 +138,8 @@ Curl_hash_add(struct curl_hash *h, void *key, size_t key_len, void *p)
|
||||
*/
|
||||
int Curl_hash_delete(struct curl_hash *h, void *key, size_t key_len)
|
||||
{
|
||||
struct curl_llist_element *le;
|
||||
struct curl_llist *l = FETCH_LIST(h, key, key_len);
|
||||
struct Curl_llist_element *le;
|
||||
struct Curl_llist *l = FETCH_LIST(h, key, key_len);
|
||||
|
||||
for(le = l->head; le; le = le->next) {
|
||||
struct curl_hash_element *he = le->ptr;
|
||||
@ -159,8 +159,8 @@ int Curl_hash_delete(struct curl_hash *h, void *key, size_t key_len)
|
||||
void *
|
||||
Curl_hash_pick(struct curl_hash *h, void *key, size_t key_len)
|
||||
{
|
||||
struct curl_llist_element *le;
|
||||
struct curl_llist *l;
|
||||
struct Curl_llist_element *le;
|
||||
struct Curl_llist *l;
|
||||
|
||||
if(h) {
|
||||
l = FETCH_LIST(h, key, key_len);
|
||||
@ -180,7 +180,7 @@ void
|
||||
Curl_hash_apply(curl_hash *h, void *user,
|
||||
void (*cb)(void *user, void *ptr))
|
||||
{
|
||||
struct curl_llist_element *le;
|
||||
struct Curl_llist_element *le;
|
||||
int i;
|
||||
|
||||
for(i = 0; i < h->slots; ++i) {
|
||||
@ -230,9 +230,9 @@ void
|
||||
Curl_hash_clean_with_criterium(struct curl_hash *h, void *user,
|
||||
int (*comp)(void *, void *))
|
||||
{
|
||||
struct curl_llist_element *le;
|
||||
struct curl_llist_element *lnext;
|
||||
struct curl_llist *list;
|
||||
struct Curl_llist_element *le;
|
||||
struct Curl_llist_element *lnext;
|
||||
struct Curl_llist *list;
|
||||
int i;
|
||||
|
||||
if(!h)
|
||||
|
@ -7,7 +7,7 @@
|
||||
* | (__| |_| | _ <| |___
|
||||
* \___|\___/|_| \_\_____|
|
||||
*
|
||||
* Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.
|
||||
* Copyright (C) 1998 - 2020, 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
|
||||
@ -44,7 +44,7 @@ typedef size_t (*comp_function) (void *key1,
|
||||
typedef void (*curl_hash_dtor)(void *);
|
||||
|
||||
struct curl_hash {
|
||||
struct curl_llist *table;
|
||||
struct Curl_llist *table;
|
||||
|
||||
/* Hash function to be used for this hash table */
|
||||
hash_function hash_func;
|
||||
@ -57,7 +57,7 @@ struct curl_hash {
|
||||
};
|
||||
|
||||
struct curl_hash_element {
|
||||
struct curl_llist_element list;
|
||||
struct Curl_llist_element list;
|
||||
void *ptr;
|
||||
size_t key_len;
|
||||
char key[1]; /* allocated memory following the struct */
|
||||
@ -66,7 +66,7 @@ struct curl_hash_element {
|
||||
struct curl_hash_iterator {
|
||||
struct curl_hash *hash;
|
||||
int slot_index;
|
||||
struct curl_llist_element *current_element;
|
||||
struct Curl_llist_element *current_element;
|
||||
};
|
||||
|
||||
int Curl_hash_init(struct curl_hash *h,
|
||||
|
12
lib/llist.c
12
lib/llist.c
@ -34,7 +34,7 @@
|
||||
* @unittest: 1300
|
||||
*/
|
||||
void
|
||||
Curl_llist_init(struct curl_llist *l, curl_llist_dtor dtor)
|
||||
Curl_llist_init(struct Curl_llist *l, Curl_llist_dtor dtor)
|
||||
{
|
||||
l->size = 0;
|
||||
l->dtor = dtor;
|
||||
@ -54,9 +54,9 @@ Curl_llist_init(struct curl_llist *l, curl_llist_dtor dtor)
|
||||
* @unittest: 1300
|
||||
*/
|
||||
void
|
||||
Curl_llist_insert_next(struct curl_llist *list, struct curl_llist_element *e,
|
||||
Curl_llist_insert_next(struct Curl_llist *list, struct Curl_llist_element *e,
|
||||
const void *p,
|
||||
struct curl_llist_element *ne)
|
||||
struct Curl_llist_element *ne)
|
||||
{
|
||||
ne->ptr = (void *) p;
|
||||
if(list->size == 0) {
|
||||
@ -90,7 +90,7 @@ Curl_llist_insert_next(struct curl_llist *list, struct curl_llist_element *e,
|
||||
* @unittest: 1300
|
||||
*/
|
||||
void
|
||||
Curl_llist_remove(struct curl_llist *list, struct curl_llist_element *e,
|
||||
Curl_llist_remove(struct Curl_llist *list, struct Curl_llist_element *e,
|
||||
void *user)
|
||||
{
|
||||
void *ptr;
|
||||
@ -131,7 +131,7 @@ Curl_llist_remove(struct curl_llist *list, struct curl_llist_element *e,
|
||||
}
|
||||
|
||||
void
|
||||
Curl_llist_destroy(struct curl_llist *list, void *user)
|
||||
Curl_llist_destroy(struct Curl_llist *list, void *user)
|
||||
{
|
||||
if(list) {
|
||||
while(list->size > 0)
|
||||
@ -140,7 +140,7 @@ Curl_llist_destroy(struct curl_llist *list, void *user)
|
||||
}
|
||||
|
||||
size_t
|
||||
Curl_llist_count(struct curl_llist *list)
|
||||
Curl_llist_count(struct Curl_llist *list)
|
||||
{
|
||||
return list->size;
|
||||
}
|
||||
|
28
lib/llist.h
28
lib/llist.h
@ -25,26 +25,26 @@
|
||||
#include "curl_setup.h"
|
||||
#include <stddef.h>
|
||||
|
||||
typedef void (*curl_llist_dtor)(void *, void *);
|
||||
typedef void (*Curl_llist_dtor)(void *, void *);
|
||||
|
||||
struct curl_llist_element {
|
||||
struct Curl_llist_element {
|
||||
void *ptr;
|
||||
struct curl_llist_element *prev;
|
||||
struct curl_llist_element *next;
|
||||
struct Curl_llist_element *prev;
|
||||
struct Curl_llist_element *next;
|
||||
};
|
||||
|
||||
struct curl_llist {
|
||||
struct curl_llist_element *head;
|
||||
struct curl_llist_element *tail;
|
||||
curl_llist_dtor dtor;
|
||||
struct Curl_llist {
|
||||
struct Curl_llist_element *head;
|
||||
struct Curl_llist_element *tail;
|
||||
Curl_llist_dtor dtor;
|
||||
size_t size;
|
||||
};
|
||||
|
||||
void Curl_llist_init(struct curl_llist *, curl_llist_dtor);
|
||||
void Curl_llist_insert_next(struct curl_llist *, struct curl_llist_element *,
|
||||
const void *, struct curl_llist_element *node);
|
||||
void Curl_llist_remove(struct curl_llist *, struct curl_llist_element *,
|
||||
void Curl_llist_init(struct Curl_llist *, Curl_llist_dtor);
|
||||
void Curl_llist_insert_next(struct Curl_llist *, struct Curl_llist_element *,
|
||||
const void *, struct Curl_llist_element *node);
|
||||
void Curl_llist_remove(struct Curl_llist *, struct Curl_llist_element *,
|
||||
void *);
|
||||
size_t Curl_llist_count(struct curl_llist *);
|
||||
void Curl_llist_destroy(struct curl_llist *, void *);
|
||||
size_t Curl_llist_count(struct Curl_llist *);
|
||||
void Curl_llist_destroy(struct Curl_llist *, void *);
|
||||
#endif /* HEADER_CURL_LLIST_H */
|
||||
|
24
lib/multi.c
24
lib/multi.c
@ -722,7 +722,7 @@ CURLMcode curl_multi_remove_handle(struct Curl_multi *multi,
|
||||
struct Curl_easy *easy = data;
|
||||
bool premature;
|
||||
bool easy_owns_conn;
|
||||
struct curl_llist_element *e;
|
||||
struct Curl_llist_element *e;
|
||||
|
||||
/* First, make some basic checks that the CURLM handle is a good handle */
|
||||
if(!GOOD_MULTI_HANDLE(multi))
|
||||
@ -2675,7 +2675,7 @@ CURLMsg *curl_multi_info_read(struct Curl_multi *multi, int *msgs_in_queue)
|
||||
!multi->in_callback &&
|
||||
Curl_llist_count(&multi->msglist)) {
|
||||
/* there is one or more messages in the list */
|
||||
struct curl_llist_element *e;
|
||||
struct Curl_llist_element *e;
|
||||
|
||||
/* extract the head of the list to return */
|
||||
e = multi->msglist.head;
|
||||
@ -2905,15 +2905,15 @@ static CURLMcode add_next_timeout(struct curltime now,
|
||||
struct Curl_easy *d)
|
||||
{
|
||||
struct curltime *tv = &d->state.expiretime;
|
||||
struct curl_llist *list = &d->state.timeoutlist;
|
||||
struct curl_llist_element *e;
|
||||
struct Curl_llist *list = &d->state.timeoutlist;
|
||||
struct Curl_llist_element *e;
|
||||
struct time_node *node = NULL;
|
||||
|
||||
/* move over the timeout list for this specific handle and remove all
|
||||
timeouts that are now passed tense and store the next pending
|
||||
timeout in *tv */
|
||||
for(e = list->head; e;) {
|
||||
struct curl_llist_element *n = e->next;
|
||||
struct Curl_llist_element *n = e->next;
|
||||
timediff_t diff;
|
||||
node = (struct time_node *)e->ptr;
|
||||
diff = Curl_timediff(node->time, now);
|
||||
@ -3267,8 +3267,8 @@ void Curl_update_timer(struct Curl_multi *multi)
|
||||
static void
|
||||
multi_deltimeout(struct Curl_easy *data, expire_id eid)
|
||||
{
|
||||
struct curl_llist_element *e;
|
||||
struct curl_llist *timeoutlist = &data->state.timeoutlist;
|
||||
struct Curl_llist_element *e;
|
||||
struct Curl_llist *timeoutlist = &data->state.timeoutlist;
|
||||
/* find and remove the specific node from the list */
|
||||
for(e = timeoutlist->head; e; e = e->next) {
|
||||
struct time_node *n = (struct time_node *)e->ptr;
|
||||
@ -3291,11 +3291,11 @@ multi_addtimeout(struct Curl_easy *data,
|
||||
struct curltime *stamp,
|
||||
expire_id eid)
|
||||
{
|
||||
struct curl_llist_element *e;
|
||||
struct Curl_llist_element *e;
|
||||
struct time_node *node;
|
||||
struct curl_llist_element *prev = NULL;
|
||||
struct Curl_llist_element *prev = NULL;
|
||||
size_t n;
|
||||
struct curl_llist *timeoutlist = &data->state.timeoutlist;
|
||||
struct Curl_llist *timeoutlist = &data->state.timeoutlist;
|
||||
|
||||
node = &data->state.expires[eid];
|
||||
|
||||
@ -3422,7 +3422,7 @@ void Curl_expire_clear(struct Curl_easy *data)
|
||||
if(nowp->tv_sec || nowp->tv_usec) {
|
||||
/* Since this is an cleared time, we must remove the previous entry from
|
||||
the splay tree */
|
||||
struct curl_llist *list = &data->state.timeoutlist;
|
||||
struct Curl_llist *list = &data->state.timeoutlist;
|
||||
int rc;
|
||||
|
||||
rc = Curl_splayremovebyaddr(multi->timetree,
|
||||
@ -3493,7 +3493,7 @@ void Curl_multiuse_state(struct connectdata *conn,
|
||||
|
||||
static void process_pending_handles(struct Curl_multi *multi)
|
||||
{
|
||||
struct curl_llist_element *e = multi->pending.head;
|
||||
struct Curl_llist_element *e = multi->pending.head;
|
||||
if(e) {
|
||||
struct Curl_easy *data = e->ptr;
|
||||
|
||||
|
@ -27,7 +27,7 @@
|
||||
#include "socketpair.h"
|
||||
|
||||
struct Curl_message {
|
||||
struct curl_llist_element list;
|
||||
struct Curl_llist_element list;
|
||||
/* the 'CURLMsg' is the part that is visible to the external user */
|
||||
struct CURLMsg extmsg;
|
||||
};
|
||||
@ -89,9 +89,9 @@ struct Curl_multi {
|
||||
int num_alive; /* amount of easy handles that are added but have not yet
|
||||
reached COMPLETE state */
|
||||
|
||||
struct curl_llist msglist; /* a list of messages from completed transfers */
|
||||
struct Curl_llist msglist; /* a list of messages from completed transfers */
|
||||
|
||||
struct curl_llist pending; /* Curl_easys that are in the
|
||||
struct Curl_llist pending; /* Curl_easys that are in the
|
||||
CURLM_STATE_CONNECT_PEND state */
|
||||
|
||||
/* callback function and user data pointer for the *socket() API */
|
||||
|
@ -1074,7 +1074,7 @@ ConnectionExists(struct Curl_easy *data,
|
||||
&hostbundle);
|
||||
if(bundle) {
|
||||
/* Max pipe length is zero (unlimited) for multiplexed connections */
|
||||
struct curl_llist_element *curr;
|
||||
struct Curl_llist_element *curr;
|
||||
|
||||
infof(data, "Found bundle for host %s: %p [%s]\n",
|
||||
hostbundle, (void *)bundle, (bundle->multiuse == BUNDLE_MULTIPLEX ?
|
||||
|
@ -861,7 +861,7 @@ struct connectdata {
|
||||
connection is used! */
|
||||
struct Curl_easy *data;
|
||||
struct connstate cnnct;
|
||||
struct curl_llist_element bundle_node; /* conncache */
|
||||
struct Curl_llist_element bundle_node; /* conncache */
|
||||
|
||||
/* chunk is for HTTP chunked encoding, but is in the general connectdata
|
||||
struct only because we can do just about any protocol through a HTTP proxy
|
||||
@ -1025,7 +1025,7 @@ struct connectdata {
|
||||
struct kerberos5data krb5; /* variables into the structure definition, */
|
||||
#endif /* however, some of them are ftp specific. */
|
||||
|
||||
struct curl_llist easyq; /* List of easy handles using this connection */
|
||||
struct Curl_llist easyq; /* List of easy handles using this connection */
|
||||
curl_seek_callback seek_func; /* function that seeks the input */
|
||||
void *seek_client; /* pointer to pass to the seek() above */
|
||||
|
||||
@ -1276,7 +1276,7 @@ typedef enum {
|
||||
* One instance for each timeout an easy handle can set.
|
||||
*/
|
||||
struct time_node {
|
||||
struct curl_llist_element list;
|
||||
struct Curl_llist_element list;
|
||||
struct curltime time;
|
||||
expire_id eid;
|
||||
};
|
||||
@ -1340,7 +1340,7 @@ struct UrlState {
|
||||
#endif /* USE_OPENSSL */
|
||||
struct curltime expiretime; /* set this with Curl_expire() only */
|
||||
struct Curl_tree timenode; /* for the splay stuff */
|
||||
struct curl_llist timeoutlist; /* list of pending timeouts */
|
||||
struct Curl_llist timeoutlist; /* list of pending timeouts */
|
||||
struct time_node expires[EXPIRE_LAST]; /* nodes for each expire type */
|
||||
|
||||
/* a place to store the most recently set FTP entrypath */
|
||||
@ -1866,8 +1866,8 @@ struct Curl_easy {
|
||||
struct Curl_easy *prev;
|
||||
|
||||
struct connectdata *conn;
|
||||
struct curl_llist_element connect_queue;
|
||||
struct curl_llist_element conn_queue; /* list per connectdata */
|
||||
struct Curl_llist_element connect_queue;
|
||||
struct Curl_llist_element conn_queue; /* list per connectdata */
|
||||
|
||||
CURLMstate mstate; /* the handle's state */
|
||||
CURLcode result; /* previous result */
|
||||
|
@ -83,7 +83,7 @@ struct ssl_backend_data {
|
||||
PRFileDesc *handle;
|
||||
char *client_nickname;
|
||||
struct Curl_easy *data;
|
||||
struct curl_llist obj_list;
|
||||
struct Curl_llist obj_list;
|
||||
PK11GenericObject *obj_clicert;
|
||||
};
|
||||
|
||||
@ -91,14 +91,14 @@ static PRLock *nss_initlock = NULL;
|
||||
static PRLock *nss_crllock = NULL;
|
||||
static PRLock *nss_findslot_lock = NULL;
|
||||
static PRLock *nss_trustload_lock = NULL;
|
||||
static struct curl_llist nss_crl_list;
|
||||
static struct Curl_llist nss_crl_list;
|
||||
static NSSInitContext *nss_context = NULL;
|
||||
static volatile int initialized = 0;
|
||||
|
||||
/* type used to wrap pointers as list nodes */
|
||||
struct ptr_list_wrap {
|
||||
void *ptr;
|
||||
struct curl_llist_element node;
|
||||
struct Curl_llist_element node;
|
||||
};
|
||||
|
||||
struct cipher_s {
|
||||
@ -430,7 +430,7 @@ static PK11SlotInfo* nss_find_slot_by_name(const char *slot_name)
|
||||
}
|
||||
|
||||
/* wrap 'ptr' as list node and tail-insert into 'list' */
|
||||
static CURLcode insert_wrapped_ptr(struct curl_llist *list, void *ptr)
|
||||
static CURLcode insert_wrapped_ptr(struct Curl_llist *list, void *ptr)
|
||||
{
|
||||
struct ptr_list_wrap *wrap = malloc(sizeof(*wrap));
|
||||
if(!wrap)
|
||||
|
@ -7,7 +7,7 @@
|
||||
* | (__| |_| | _ <| |___
|
||||
* \___|\___/|_| \_\_____|
|
||||
*
|
||||
* Copyright (C) 2010 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.
|
||||
* Copyright (C) 2010 - 2020, 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
|
||||
@ -48,7 +48,7 @@ struct WildcardData {
|
||||
curl_wildcard_states state;
|
||||
char *path; /* path to the directory, where we trying wildcard-match */
|
||||
char *pattern; /* wildcard pattern */
|
||||
struct curl_llist filelist; /* llist with struct Curl_fileinfo */
|
||||
struct Curl_llist filelist; /* llist with struct Curl_fileinfo */
|
||||
void *protdata; /* pointer to protocol specific temporary data */
|
||||
curl_wildcard_dtor dtor;
|
||||
void *customptr; /* for CURLOPT_CHUNK_DATA pointer */
|
||||
|
@ -23,11 +23,11 @@
|
||||
|
||||
#include "llist.h"
|
||||
|
||||
static struct curl_llist llist;
|
||||
static struct Curl_llist llist;
|
||||
|
||||
static struct curl_llist llist_destination;
|
||||
static struct Curl_llist llist_destination;
|
||||
|
||||
static void test_curl_llist_dtor(void *key, void *value)
|
||||
static void test_Curl_llist_dtor(void *key, void *value)
|
||||
{
|
||||
/* used by the llist API, does nothing here */
|
||||
(void)key;
|
||||
@ -36,8 +36,8 @@ static void test_curl_llist_dtor(void *key, void *value)
|
||||
|
||||
static CURLcode unit_setup(void)
|
||||
{
|
||||
Curl_llist_init(&llist, test_curl_llist_dtor);
|
||||
Curl_llist_init(&llist_destination, test_curl_llist_dtor);
|
||||
Curl_llist_init(&llist, test_Curl_llist_dtor);
|
||||
Curl_llist_init(&llist_destination, test_Curl_llist_dtor);
|
||||
return CURLE_OK;
|
||||
}
|
||||
|
||||
@ -50,14 +50,14 @@ UNITTEST_START
|
||||
int unusedData_case1 = 1;
|
||||
int unusedData_case2 = 2;
|
||||
int unusedData_case3 = 3;
|
||||
struct curl_llist_element case1_list;
|
||||
struct curl_llist_element case2_list;
|
||||
struct curl_llist_element case3_list;
|
||||
struct curl_llist_element case4_list;
|
||||
struct curl_llist_element *head;
|
||||
struct curl_llist_element *element_next;
|
||||
struct curl_llist_element *element_prev;
|
||||
struct curl_llist_element *to_remove;
|
||||
struct Curl_llist_element case1_list;
|
||||
struct Curl_llist_element case2_list;
|
||||
struct Curl_llist_element case3_list;
|
||||
struct Curl_llist_element case4_list;
|
||||
struct Curl_llist_element *head;
|
||||
struct Curl_llist_element *element_next;
|
||||
struct Curl_llist_element *element_prev;
|
||||
struct Curl_llist_element *to_remove;
|
||||
size_t llist_size = Curl_llist_count(&llist);
|
||||
|
||||
/**
|
||||
@ -74,8 +74,8 @@ UNITTEST_START
|
||||
fail_unless(llist.size == 0, "list initial size should be zero");
|
||||
fail_unless(llist.head == NULL, "list head should initiate to NULL");
|
||||
fail_unless(llist.tail == NULL, "list tail should intiate to NULL");
|
||||
fail_unless(llist.dtor == test_curl_llist_dtor,
|
||||
"list dtor should initiate to test_curl_llist_dtor");
|
||||
fail_unless(llist.dtor == test_Curl_llist_dtor,
|
||||
"list dtor should initiate to test_Curl_llist_dtor");
|
||||
|
||||
/**
|
||||
* testing Curl_llist_insert_next
|
||||
|
Loading…
Reference in New Issue
Block a user