multi-uv.c: Updated for curl coding standards

This commit is contained in:
Steve Holme 2014-11-19 20:10:27 +00:00
parent 34cb17b930
commit 804e462305
1 changed files with 19 additions and 18 deletions

View File

@ -64,13 +64,13 @@ curl_context_t* create_curl_context(curl_socket_t sockfd)
void curl_close_cb(uv_handle_t *handle)
{
curl_context_t* context = (curl_context_t*) handle->data;
curl_context_t *context = (curl_context_t *) handle->data;
free(context);
}
void destroy_curl_context(curl_context_t *context)
{
uv_close((uv_handle_t*) &context->poll_handle, curl_close_cb);
uv_close((uv_handle_t *) &context->poll_handle, curl_close_cb);
}
@ -83,7 +83,7 @@ void add_download(const char *url, int num)
sprintf(filename, "%d.download", num);
file = fopen(filename, "w");
if (file == NULL) {
if(!file) {
fprintf(stderr, "Error opening %s\n", filename);
return;
}
@ -104,8 +104,8 @@ static void check_multi_info(void)
int pending;
FILE *file;
while ((message = curl_multi_info_read(curl_handle, &pending))) {
switch (message->msg) {
while((message = curl_multi_info_read(curl_handle, &pending))) {
switch(message->msg) {
case CURLMSG_DONE:
curl_easy_getinfo(message->easy_handle, CURLINFO_EFFECTIVE_URL,
&done_url);
@ -114,7 +114,7 @@ static void check_multi_info(void)
curl_multi_remove_handle(curl_handle, message->easy_handle);
curl_easy_cleanup(message->easy_handle);
if (file) {
if(file) {
fclose(file);
}
break;
@ -137,12 +137,12 @@ void curl_perform(uv_poll_t *req, int status, int events)
uv_timer_stop(&timeout);
if (events & UV_READABLE)
if(events & UV_READABLE)
flags |= CURL_CSELECT_IN;
if (events & UV_WRITABLE)
if(events & UV_WRITABLE)
flags |= CURL_CSELECT_OUT;
context = (curl_context_t*)req;
context = (curl_context_t *) req;
curl_multi_socket_action(curl_handle, context->sockfd, flags,
&running_handles);
@ -160,7 +160,7 @@ void on_timeout(uv_timer_t *req, int status)
void start_timeout(CURLM *multi, long timeout_ms, void *userp)
{
if (timeout_ms <= 0)
if(timeout_ms <= 0)
timeout_ms = 1; /* 0 means directly call socket_action, but we'll do it in
a bit */
uv_timer_start(&timeout, on_timeout, timeout_ms, 0);
@ -170,9 +170,9 @@ int handle_socket(CURL *easy, curl_socket_t s, int action, void *userp,
void *socketp)
{
curl_context_t *curl_context;
if (action == CURL_POLL_IN || action == CURL_POLL_OUT) {
if (socketp) {
curl_context = (curl_context_t*) socketp;
if(action == CURL_POLL_IN || action == CURL_POLL_OUT) {
if(socketp) {
curl_context = (curl_context_t *) socketp;
}
else {
curl_context = create_curl_context(s);
@ -180,7 +180,7 @@ int handle_socket(CURL *easy, curl_socket_t s, int action, void *userp,
curl_multi_assign(curl_handle, s, (void *) curl_context);
}
switch (action) {
switch(action) {
case CURL_POLL_IN:
uv_poll_start(&curl_context->poll_handle, UV_READABLE, curl_perform);
break;
@ -188,7 +188,7 @@ int handle_socket(CURL *easy, curl_socket_t s, int action, void *userp,
uv_poll_start(&curl_context->poll_handle, UV_WRITABLE, curl_perform);
break;
case CURL_POLL_REMOVE:
if (socketp) {
if(socketp) {
uv_poll_stop(&((curl_context_t*)socketp)->poll_handle);
destroy_curl_context((curl_context_t*) socketp);
curl_multi_assign(curl_handle, s, NULL);
@ -205,10 +205,10 @@ int main(int argc, char **argv)
{
loop = uv_default_loop();
if (argc <= 1)
if(argc <= 1)
return 0;
if (curl_global_init(CURL_GLOBAL_ALL)) {
if(curl_global_init(CURL_GLOBAL_ALL)) {
fprintf(stderr, "Could not init cURL\n");
return 1;
}
@ -219,11 +219,12 @@ int main(int argc, char **argv)
curl_multi_setopt(curl_handle, CURLMOPT_SOCKETFUNCTION, handle_socket);
curl_multi_setopt(curl_handle, CURLMOPT_TIMERFUNCTION, start_timeout);
while (argc-- > 1) {
while(argc-- > 1) {
add_download(argv[argc], argc);
}
uv_run(loop, UV_RUN_DEFAULT);
curl_multi_cleanup(curl_handle);
return 0;
}