mirror of
https://github.com/curl/curl.git
synced 2026-08-02 17:10:29 +03:00
lib: fix formatting nits (part 3)
From `lib/h` to `lib/w`. part 1:47a1ab2ebe#19764 part 2:86b346443b#19800 Closes #19811
This commit is contained in:
parent
dc8c0d54a5
commit
c3b030b860
102 changed files with 2001 additions and 2226 deletions
|
|
@ -64,7 +64,7 @@ struct mev_sh_entry {
|
|||
|
||||
static size_t mev_sh_entry_hash(void *key, size_t key_length, size_t slots_num)
|
||||
{
|
||||
curl_socket_t fd = *((curl_socket_t *) key);
|
||||
curl_socket_t fd = *((curl_socket_t *)key);
|
||||
(void)key_length;
|
||||
return (fd % (curl_socket_t)slots_num);
|
||||
}
|
||||
|
|
@ -72,8 +72,9 @@ static size_t mev_sh_entry_hash(void *key, size_t key_length, size_t slots_num)
|
|||
static size_t mev_sh_entry_compare(void *k1, size_t k1_len,
|
||||
void *k2, size_t k2_len)
|
||||
{
|
||||
(void)k1_len; (void)k2_len;
|
||||
return (*((curl_socket_t *) k1)) == (*((curl_socket_t *) k2));
|
||||
(void)k1_len;
|
||||
(void)k2_len;
|
||||
return (*((curl_socket_t *)k1)) == (*((curl_socket_t *)k2));
|
||||
}
|
||||
|
||||
/* sockhash entry destructor callback */
|
||||
|
|
@ -85,8 +86,8 @@ static void mev_sh_entry_dtor(void *freethis)
|
|||
}
|
||||
|
||||
/* look up a given socket in the socket hash, skip invalid sockets */
|
||||
static struct mev_sh_entry *
|
||||
mev_sh_entry_get(struct Curl_hash *sh, curl_socket_t s)
|
||||
static struct mev_sh_entry *mev_sh_entry_get(struct Curl_hash *sh,
|
||||
curl_socket_t s)
|
||||
{
|
||||
if(s != CURL_SOCKET_BAD) {
|
||||
/* only look for proper sockets */
|
||||
|
|
@ -96,8 +97,8 @@ mev_sh_entry_get(struct Curl_hash *sh, curl_socket_t s)
|
|||
}
|
||||
|
||||
/* make sure this socket is present in the hash for this handle */
|
||||
static struct mev_sh_entry *
|
||||
mev_sh_entry_add(struct Curl_hash *sh, curl_socket_t s)
|
||||
static struct mev_sh_entry *mev_sh_entry_add(struct Curl_hash *sh,
|
||||
curl_socket_t s)
|
||||
{
|
||||
struct mev_sh_entry *there = mev_sh_entry_get(sh, s);
|
||||
struct mev_sh_entry *check;
|
||||
|
|
@ -166,7 +167,6 @@ static bool mev_sh_entry_conn_add(struct mev_sh_entry *e,
|
|||
return TRUE;
|
||||
}
|
||||
|
||||
|
||||
static bool mev_sh_entry_xfer_remove(struct mev_sh_entry *e,
|
||||
struct Curl_easy *data)
|
||||
{
|
||||
|
|
@ -202,8 +202,7 @@ static CURLMcode mev_forget_socket(struct Curl_multi *multi,
|
|||
|
||||
/* We managed this socket before, tell the socket callback to forget it. */
|
||||
if(entry->announced && multi->socket_cb) {
|
||||
CURL_TRC_M(data, "ev %s, call(fd=%" FMT_SOCKET_T ", ev=REMOVE)",
|
||||
cause, s);
|
||||
CURL_TRC_M(data, "ev %s, call(fd=%" FMT_SOCKET_T ", ev=REMOVE)", cause, s);
|
||||
mev_in_callback(multi, TRUE);
|
||||
rc = multi->socket_cb(data, s, CURL_POLL_REMOVE,
|
||||
multi->socket_userp, entry->user_data);
|
||||
|
|
@ -446,8 +445,7 @@ static void mev_pollset_dtor(void *key, size_t klen, void *entry)
|
|||
}
|
||||
}
|
||||
|
||||
static struct easy_pollset*
|
||||
mev_add_new_conn_pollset(struct connectdata *conn)
|
||||
static struct easy_pollset *mev_add_new_conn_pollset(struct connectdata *conn)
|
||||
{
|
||||
struct easy_pollset *ps;
|
||||
|
||||
|
|
@ -459,8 +457,7 @@ mev_add_new_conn_pollset(struct connectdata *conn)
|
|||
return ps;
|
||||
}
|
||||
|
||||
static struct easy_pollset*
|
||||
mev_add_new_xfer_pollset(struct Curl_easy *data)
|
||||
static struct easy_pollset *mev_add_new_xfer_pollset(struct Curl_easy *data)
|
||||
{
|
||||
struct easy_pollset *ps;
|
||||
|
||||
|
|
@ -472,9 +469,8 @@ mev_add_new_xfer_pollset(struct Curl_easy *data)
|
|||
return ps;
|
||||
}
|
||||
|
||||
static struct easy_pollset *
|
||||
mev_get_last_pollset(struct Curl_easy *data,
|
||||
struct connectdata *conn)
|
||||
static struct easy_pollset *mev_get_last_pollset(struct Curl_easy *data,
|
||||
struct connectdata *conn)
|
||||
{
|
||||
if(data) {
|
||||
if(conn)
|
||||
|
|
@ -484,8 +480,7 @@ mev_get_last_pollset(struct Curl_easy *data,
|
|||
return NULL;
|
||||
}
|
||||
|
||||
static CURLMcode mev_assess(struct Curl_multi *multi,
|
||||
struct Curl_easy *data,
|
||||
static CURLMcode mev_assess(struct Curl_multi *multi, struct Curl_easy *data,
|
||||
struct connectdata *conn)
|
||||
{
|
||||
struct easy_pollset ps, *last_ps;
|
||||
|
|
@ -551,13 +546,11 @@ CURLMcode Curl_multi_ev_assess_xfer_bset(struct Curl_multi *multi,
|
|||
struct Curl_easy *data = Curl_multi_get_easy(multi, mid);
|
||||
if(data)
|
||||
result = Curl_multi_ev_assess_xfer(multi, data);
|
||||
}
|
||||
while(!result && Curl_uint32_bset_next(set, mid, &mid));
|
||||
} while(!result && Curl_uint32_bset_next(set, mid, &mid));
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
CURLMcode Curl_multi_ev_assign(struct Curl_multi *multi,
|
||||
curl_socket_t s,
|
||||
void *user_data)
|
||||
|
|
@ -596,8 +589,7 @@ void Curl_multi_ev_dirty_xfers(struct Curl_multi *multi,
|
|||
CURL_TRC_M(multi->admin, "socket transfer %u no longer found", mid);
|
||||
Curl_uint32_spbset_remove(&entry->xfers, mid);
|
||||
}
|
||||
}
|
||||
while(Curl_uint32_spbset_next(&entry->xfers, mid, &mid));
|
||||
} while(Curl_uint32_spbset_next(&entry->xfers, mid, &mid));
|
||||
}
|
||||
|
||||
if(entry->conn)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue