romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-04-14 22:31:41 +03:00
Code Issues Projects Releases Packages Wiki Activity

lib: fix formatting nits (part 2)

Browse source 
From `lib/curl*` to `lib/g*`. With fixes to part 1.

part 1: 47a1ab2ebe #19764

Closes #19800
This commit is contained in:
Viktor Szakats 2025-11-27 04:27:26 +01:00
parent 3e2a946926
commit 86b346443b
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
56 changed files with 976 additions and 1088 deletions
Download patch file Download diff file Expand all files Collapse all files

22
lib/easy.c
View file

@ -87,7 +87,7 @@ static long easy_init_flags;
#ifdef GLOBAL_INIT_IS_THREADSAFE
static curl_simple_lock s_lock = CURL_SIMPLE_LOCK_INIT;
#define global_init_lock() curl_simple_lock_lock(&s_lock)
#define global_init_lock() curl_simple_lock_lock(&s_lock)
#define global_init_unlock() curl_simple_lock_unlock(&s_lock)
#else
@ -208,7 +208,6 @@ fail:
return CURLE_FAILED_INIT;
}
/**
* curl_global_init() globally initializes curl given a bitwise set of the
* different features of what to initialize.
@ -411,7 +410,6 @@ static int events_timer(CURLM *multi, /* multi handle */
return 0;
}
/* poll2cselect
*
* convert from poll() bit definitions to libcurl's CURL_CSELECT_* ones
@ -428,7 +426,6 @@ static int poll2cselect(int pollmask)
return omask;
}
/* socketcb2poll
*
* convert from libcurl' CURL_POLL_* bit definitions to poll()'s
@ -485,10 +482,9 @@ static int events_socket(CURL *easy, /* easy handle */
/* The socket 's' is already being monitored, update the activity
mask. Convert from libcurl bitmask to the poll one. */
m->socket.events = socketcb2poll(what);
infof(data, "socket cb: socket %" FMT_SOCKET_T
" UPDATED as %s%s", s,
(what&CURL_POLL_IN) ? "IN" : "",
(what&CURL_POLL_OUT) ? "OUT" : "");
infof(data, "socket cb: socket %" FMT_SOCKET_T " UPDATED as %s%s", s,
(what & CURL_POLL_IN) ? "IN" : "",
(what & CURL_POLL_OUT) ? "OUT" : "");
}
break;
}
@ -512,8 +508,8 @@ static int events_socket(CURL *easy, /* easy handle */
m->socket.revents = 0;
ev->list = m;
infof(data, "socket cb: socket %" FMT_SOCKET_T " ADDED as %s%s", s,
(what&CURL_POLL_IN) ? "IN" : "",
(what&CURL_POLL_OUT) ? "OUT" : "");
(what & CURL_POLL_IN) ? "IN" : "",
(what & CURL_POLL_OUT) ? "OUT" : "");
}
else
return CURLE_OUT_OF_MEMORY;
@ -523,7 +519,6 @@ static int events_socket(CURL *easy, /* easy handle */
return 0;
}
/*
* events_setup()
*
@ -681,7 +676,6 @@ static CURLcode wait_or_timeout(struct Curl_multi *multi, struct events *ev)
return result;
}
/* easy_events()
*
* Runs a transfer in a blocking manner using the events-based API
@ -690,7 +684,7 @@ static CURLcode easy_events(struct Curl_multi *multi)
{
/* this struct is made static to allow it to be used after this function
returns and curl_multi_remove_handle() is called */
static struct events evs = {-1, FALSE, 0, NULL, 0};
static struct events evs = { -1, FALSE, 0, NULL, 0 };
/* if running event-based, do some further multi inits */
events_setup(multi, &evs);
@ -738,7 +732,6 @@ static CURLcode easy_transfer(struct Curl_multi *multi)
return result;
}
/*
* easy_perform() is the internal interface that performs a blocking
* transfer as previously setup.
@ -1201,7 +1194,6 @@ CURLcode curl_easy_pause(CURL *d, int action)
return result;
}
static CURLcode easy_connection(struct Curl_easy *data,
struct connectdata **connp)
{