moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

typedefs: use the full structs in internal code... 

... and save the typedef'ed names for headers and external APIs.
This commit is contained in:
Daniel Stenberg 2016-06-21 19:31:24 +02:00
parent 434f8d0389
commit 80388edefc
7 changed files with 51 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lib/easy.c
View File

@ -365,7 +365,7 @@ void curl_global_cleanup(void)
* curl_easy_init() is the external interface to alloc, setup and init an * curl_easy_init() is the external interface to alloc, setup and init an
* easy handle that is returned. If anything goes wrong, NULL is returned. * easy handle that is returned. If anything goes wrong, NULL is returned.
*/ */
CURL *curl_easy_init(void) struct Curl_easy *curl_easy_init(void)
{ {
CURLcode result; CURLcode result;
struct Curl_easy *data; struct Curl_easy *data;
@ -396,7 +396,7 @@ CURL *curl_easy_init(void)
*/ */
#undef curl_easy_setopt #undef curl_easy_setopt
CURLcode curl_easy_setopt(CURL *data, CURLoption tag, ...) CURLcode curl_easy_setopt(struct Curl_easy *data, CURLoption tag, ...)
{ {
va_list arg; va_list arg;
CURLcode result; CURLcode result;
@ -433,7 +433,7 @@ struct events {
* updated. * updated.
*/ */
static int events_timer(CURLM *multi, /* multi handle */ static int events_timer(struct Curl_multi *multi, /* multi handle */
long timeout_ms, /* see above */ long timeout_ms, /* see above */
void *userp) /* private callback pointer */ void *userp) /* private callback pointer */
{ {
@ -488,7 +488,7 @@ static short socketcb2poll(int pollmask)
* Callback that gets called with information about socket activity to * Callback that gets called with information about socket activity to
* monitor. * monitor.
*/ */
static int events_socket(CURL *easy, /* easy handle */ static int events_socket(struct Curl_easy *easy, /* easy handle */
curl_socket_t s, /* socket */ curl_socket_t s, /* socket */
int what, /* see above */ int what, /* see above */
void *userp, /* private callback void *userp, /* private callback
@ -566,7 +566,7 @@ static int events_socket(CURL *easy, /* easy handle */
* *
* Do the multi handle setups that only event-based transfers need. * Do the multi handle setups that only event-based transfers need.
*/ */
static void events_setup(CURLM *multi, struct events *ev) static void events_setup(struct Curl_multi *multi, struct events *ev)
{ {
/* timer callback */ /* timer callback */
curl_multi_setopt(multi, CURLMOPT_TIMERFUNCTION, events_timer); curl_multi_setopt(multi, CURLMOPT_TIMERFUNCTION, events_timer);
@ -670,7 +670,7 @@ static CURLcode wait_or_timeout(struct Curl_multi *multi, struct events *ev)
* *
* Runs a transfer in a blocking manner using the events-based API * Runs a transfer in a blocking manner using the events-based API
*/ */
static CURLcode easy_events(CURLM *multi) static CURLcode easy_events(struct Curl_multi *multi)
{ {
struct events evs= {2, FALSE, 0, NULL, 0}; struct events evs= {2, FALSE, 0, NULL, 0};
@ -684,7 +684,7 @@ static CURLcode easy_events(CURLM *multi)
#define easy_events(x) CURLE_NOT_BUILT_IN #define easy_events(x) CURLE_NOT_BUILT_IN
#endif #endif
static CURLcode easy_transfer(CURLM *multi) static CURLcode easy_transfer(struct Curl_multi *multi)
{ {
bool done = FALSE; bool done = FALSE;
CURLMcode mcode = CURLM_OK; CURLMcode mcode = CURLM_OK;
@ -766,7 +766,7 @@ static CURLcode easy_transfer(CURLM *multi)
*/ */
static CURLcode easy_perform(struct Curl_easy *data, bool events) static CURLcode easy_perform(struct Curl_easy *data, bool events)
{ {
CURLM *multi; struct Curl_multi *multi;
CURLMcode mcode; CURLMcode mcode;
CURLcode result = CURLE_OK; CURLcode result = CURLE_OK;
SIGPIPE_VARIABLE(pipe_st); SIGPIPE_VARIABLE(pipe_st);
@ -826,7 +826,7 @@ static CURLcode easy_perform(struct Curl_easy *data, bool events)
* curl_easy_perform() is the external interface that performs a blocking * curl_easy_perform() is the external interface that performs a blocking
* transfer as previously setup. * transfer as previously setup.
*/ */
CURLcode curl_easy_perform(CURL *data) CURLcode curl_easy_perform(struct Curl_easy *data)
{ {
return easy_perform(data, FALSE); return easy_perform(data, FALSE);
} }
@ -836,7 +836,7 @@ CURLcode curl_easy_perform(CURL *data)
* curl_easy_perform_ev() is the external interface that performs a blocking * curl_easy_perform_ev() is the external interface that performs a blocking
* transfer using the event-based API internally. * transfer using the event-based API internally.
*/ */
CURLcode curl_easy_perform_ev(CURL *data) CURLcode curl_easy_perform_ev(struct Curl_easy *data)
{ {
return easy_perform(data, TRUE); return easy_perform(data, TRUE);
} }
@ -847,7 +847,7 @@ CURLcode curl_easy_perform_ev(CURL *data)
* curl_easy_cleanup() is the external interface to cleaning/freeing the given * curl_easy_cleanup() is the external interface to cleaning/freeing the given
* easy handle. * easy handle.
*/ */
void curl_easy_cleanup(CURL *data) void curl_easy_cleanup(struct Curl_easy *data)
{ {
SIGPIPE_VARIABLE(pipe_st); SIGPIPE_VARIABLE(pipe_st);
@ -864,7 +864,7 @@ void curl_easy_cleanup(CURL *data)
* information from a performed transfer and similar. * information from a performed transfer and similar.
*/ */
#undef curl_easy_getinfo #undef curl_easy_getinfo
CURLcode curl_easy_getinfo(CURL *data, CURLINFO info, ...) CURLcode curl_easy_getinfo(struct Curl_easy *data, CURLINFO info, ...)
{ {
va_list arg; va_list arg;
void *paramp; void *paramp;
@ -884,7 +884,7 @@ CURLcode curl_easy_getinfo(CURL *data, CURLINFO info, ...)
* given input easy handle. The returned handle will be a new working handle * given input easy handle. The returned handle will be a new working handle
* with all options set exactly as the input source handle. * with all options set exactly as the input source handle.
*/ */
CURL *curl_easy_duphandle(CURL *data) struct Curl_easy *curl_easy_duphandle(struct Curl_easy *data)
{ {
struct Curl_easy *outcurl = calloc(1, sizeof(struct Curl_easy)); struct Curl_easy *outcurl = calloc(1, sizeof(struct Curl_easy));
if(NULL == outcurl) if(NULL == outcurl)
@ -977,7 +977,7 @@ CURL *curl_easy_duphandle(CURL *data)
* curl_easy_reset() is an external interface that allows an app to re- * curl_easy_reset() is an external interface that allows an app to re-
* initialize a session handle to the default values. * initialize a session handle to the default values.
*/ */
void curl_easy_reset(CURL *data) void curl_easy_reset(struct Curl_easy *data)
{ {
Curl_safefree(data->state.pathbuffer); Curl_safefree(data->state.pathbuffer);
@ -1007,7 +1007,7 @@ void curl_easy_reset(CURL *data)
* *
* Action is a bitmask consisting of CURLPAUSE_* bits in curl/curl.h * Action is a bitmask consisting of CURLPAUSE_* bits in curl/curl.h
*/ */
CURLcode curl_easy_pause(CURL *data, int action) CURLcode curl_easy_pause(struct Curl_easy *data, int action)
{ {
struct SingleRequest *k = &data->req; struct SingleRequest *k = &data->req;
CURLcode result = CURLE_OK; CURLcode result = CURLE_OK;
@ -1076,7 +1076,8 @@ static CURLcode easy_connection(struct Curl_easy *data,
* curl_easy_perform() with CURLOPT_CONNECT_ONLY option. * curl_easy_perform() with CURLOPT_CONNECT_ONLY option.
* Returns CURLE_OK on success, error code on error. * Returns CURLE_OK on success, error code on error.
*/ */
CURLcode curl_easy_recv(CURL *data, void *buffer, size_t buflen, size_t *n) CURLcode curl_easy_recv(struct Curl_easy *data, void *buffer, size_t buflen,
size_t *n)
{ {
curl_socket_t sfd; curl_socket_t sfd;
CURLcode result; CURLcode result;
@ -1102,8 +1103,8 @@ CURLcode curl_easy_recv(CURL *data, void *buffer, size_t buflen, size_t *n)
* Sends data over the connected socket. Use after successful * Sends data over the connected socket. Use after successful
* curl_easy_perform() with CURLOPT_CONNECT_ONLY option. * curl_easy_perform() with CURLOPT_CONNECT_ONLY option.
*/ */
CURLcode curl_easy_send(CURL *data, const void *buffer, size_t buflen, CURLcode curl_easy_send(struct Curl_easy *data, const void *buffer,
size_t *n) size_t buflen, size_t *n)
{ {
curl_socket_t sfd; curl_socket_t sfd;
CURLcode result; CURLcode result;

4
lib/easyif.h
View File

@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -26,7 +26,7 @@
* Prototypes for library-wide functions provided by easy.c * Prototypes for library-wide functions provided by easy.c
*/ */
#ifdef CURLDEBUG #ifdef CURLDEBUG
CURL_EXTERN CURLcode curl_easy_perform_ev(CURL *easy); CURL_EXTERN CURLcode curl_easy_perform_ev(struct Curl_easy *easy);
#endif #endif
#endif /* HEADER_CURL_EASYIF_H */ #endif /* HEADER_CURL_EASYIF_H */

11
lib/escape.c
View File

@ -75,7 +75,8 @@ char *curl_unescape(const char *string, int length)
return curl_easy_unescape(NULL, string, length, NULL); return curl_easy_unescape(NULL, string, length, NULL);
} }
char *curl_easy_escape(CURL *handle, const char *string, int inlength) char *curl_easy_escape(struct Curl_easy *data, const char *string,
int inlength)
{ {
size_t alloc = (inlength?(size_t)inlength:strlen(string))+1; size_t alloc = (inlength?(size_t)inlength:strlen(string))+1;
char *ns; char *ns;
@ -112,7 +113,7 @@ char *curl_easy_escape(CURL *handle, const char *string, int inlength)
} }
} }
result = Curl_convert_to_network(handle, &in, 1); result = Curl_convert_to_network(data, &in, 1);
if(result) { if(result) {
/* Curl_convert_to_network calls failf if unsuccessful */ /* Curl_convert_to_network calls failf if unsuccessful */
free(ns); free(ns);
@ -206,13 +207,13 @@ CURLcode Curl_urldecode(struct Curl_easy *data,
* If length == 0, the length is assumed to be strlen(string). * If length == 0, the length is assumed to be strlen(string).
* If olen == NULL, no output length is stored. * If olen == NULL, no output length is stored.
*/ */
char *curl_easy_unescape(CURL *handle, const char *string, int length, char *curl_easy_unescape(struct Curl_easy *data, const char *string,
int *olen) int length, int *olen)
{ {
char *str = NULL; char *str = NULL;
size_t inputlen = length; size_t inputlen = length;
size_t outputlen; size_t outputlen;
CURLcode res = Curl_urldecode(handle, string, inputlen, &str, &outputlen, CURLcode res = Curl_urldecode(data, string, inputlen, &str, &outputlen,
FALSE); FALSE);
if(res) if(res)
return NULL; return NULL;

2
lib/http2.c
View File

@ -335,7 +335,7 @@ char *curl_pushheader_byname(struct curl_pushheaders *h, const char *header)
return NULL; return NULL;
} }
static CURL *duphandle(struct Curl_easy *data) static struct Curl_easy *duphandle(struct Curl_easy *data)
{ {
struct Curl_easy *second = curl_easy_duphandle(data); struct Curl_easy *second = curl_easy_duphandle(data);
if(second) { if(second) {

35
lib/multi.c
View File

@ -61,7 +61,7 @@
#define CURL_MULTI_HANDLE 0x000bab1e #define CURL_MULTI_HANDLE 0x000bab1e
#define GOOD_MULTI_HANDLE(x) \ #define GOOD_MULTI_HANDLE(x) \
((x) && (((struct Curl_multi *)(x))->type == CURL_MULTI_HANDLE)) ((x) && (x)->type == CURL_MULTI_HANDLE)
static void singlesocket(struct Curl_multi *multi, static void singlesocket(struct Curl_multi *multi,
struct Curl_easy *data); struct Curl_easy *data);
@ -334,7 +334,7 @@ struct Curl_multi *Curl_multi_handle(int hashsize, /* socket hash */
/* -1 means it not set by user, use the default value */ /* -1 means it not set by user, use the default value */
multi->maxconnects = -1; multi->maxconnects = -1;
return (CURLM *) multi; return multi;
error: error:
@ -350,13 +350,14 @@ struct Curl_multi *Curl_multi_handle(int hashsize, /* socket hash */
return NULL; return NULL;
} }
CURLM *curl_multi_init(void) struct Curl_multi *curl_multi_init(void)
{ {
return Curl_multi_handle(CURL_SOCKET_HASH_TABLE_SIZE, return Curl_multi_handle(CURL_SOCKET_HASH_TABLE_SIZE,
CURL_CONNECTION_HASH_SIZE); CURL_CONNECTION_HASH_SIZE);
} }
CURLMcode curl_multi_add_handle(CURLM *multi, CURL *data) CURLMcode curl_multi_add_handle(struct Curl_multi *multi,
struct Curl_easy *data)
{ {
struct curl_llist *timeoutlist; struct curl_llist *timeoutlist;
@ -642,7 +643,8 @@ static CURLcode multi_done(struct connectdata **connp,
return result; return result;
} }
CURLMcode curl_multi_remove_handle(CURLM *multi, CURL *data) CURLMcode curl_multi_remove_handle(struct Curl_multi *multi,
struct Curl_easy *data)
{ {
struct Curl_easy *easy = data; struct Curl_easy *easy = data;
bool premature; bool premature;
@ -904,7 +906,7 @@ static int multi_getsock(struct Curl_easy *data,
} }
CURLMcode curl_multi_fdset(CURLM *multi, CURLMcode curl_multi_fdset(struct Curl_multi *multi,
fd_set *read_fd_set, fd_set *write_fd_set, fd_set *read_fd_set, fd_set *write_fd_set,
fd_set *exc_fd_set, int *max_fd) fd_set *exc_fd_set, int *max_fd)
{ {
@ -953,7 +955,7 @@ CURLMcode curl_multi_fdset(CURLM *multi,
return CURLM_OK; return CURLM_OK;
} }
CURLMcode curl_multi_wait(CURLM *multi, CURLMcode curl_multi_wait(struct Curl_multi *multi,
struct curl_waitfd extra_fds[], struct curl_waitfd extra_fds[],
unsigned int extra_nfds, unsigned int extra_nfds,
int timeout_ms, int timeout_ms,
@ -2094,7 +2096,7 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi,
} }
CURLMcode curl_multi_perform(CURLM *multi, int *running_handles) CURLMcode curl_multi_perform(struct Curl_multi *multi, int *running_handles)
{ {
struct Curl_easy *data; struct Curl_easy *data;
CURLMcode returncode=CURLM_OK; CURLMcode returncode=CURLM_OK;
@ -2163,7 +2165,7 @@ static void close_all_connections(struct Curl_multi *multi)
} }
} }
CURLMcode curl_multi_cleanup(CURLM *multi) CURLMcode curl_multi_cleanup(struct Curl_multi *multi)
{ {
struct Curl_easy *data; struct Curl_easy *data;
struct Curl_easy *nextdata; struct Curl_easy *nextdata;
@ -2237,7 +2239,7 @@ CURLMcode curl_multi_cleanup(CURLM *multi)
* beyond. The current design is fully O(1). * beyond. The current design is fully O(1).
*/ */
CURLMsg *curl_multi_info_read(CURLM *multi, int *msgs_in_queue) CURLMsg *curl_multi_info_read(struct Curl_multi *multi, int *msgs_in_queue)
{ {
struct Curl_message *msg; struct Curl_message *msg;
@ -2628,7 +2630,7 @@ static CURLMcode multi_socket(struct Curl_multi *multi,
} }
#undef curl_multi_setopt #undef curl_multi_setopt
CURLMcode curl_multi_setopt(CURLM *multi, CURLMcode curl_multi_setopt(struct Curl_multi *multi,
CURLMoption option, ...) CURLMoption option, ...)
{ {
CURLMcode res = CURLM_OK; CURLMcode res = CURLM_OK;
@ -2698,7 +2700,7 @@ CURLMcode curl_multi_setopt(CURLM *multi,
/* we define curl_multi_socket() in the public multi.h header */ /* we define curl_multi_socket() in the public multi.h header */
#undef curl_multi_socket #undef curl_multi_socket
CURLMcode curl_multi_socket(CURLM *multi, curl_socket_t s, CURLMcode curl_multi_socket(struct Curl_multi *multi, curl_socket_t s,
int *running_handles) int *running_handles)
{ {
CURLMcode result = multi_socket(multi, FALSE, s, 0, running_handles); CURLMcode result = multi_socket(multi, FALSE, s, 0, running_handles);
@ -2707,7 +2709,7 @@ CURLMcode curl_multi_socket(CURLM *multi, curl_socket_t s,
return result; return result;
} }
CURLMcode curl_multi_socket_action(CURLM *multi, curl_socket_t s, CURLMcode curl_multi_socket_action(struct Curl_multi *multi, curl_socket_t s,
int ev_bitmask, int *running_handles) int ev_bitmask, int *running_handles)
{ {
CURLMcode result = multi_socket(multi, FALSE, s, CURLMcode result = multi_socket(multi, FALSE, s,
@ -2717,7 +2719,7 @@ CURLMcode curl_multi_socket_action(CURLM *multi, curl_socket_t s,
return result; return result;
} }
CURLMcode curl_multi_socket_all(CURLM *multi, int *running_handles) CURLMcode curl_multi_socket_all(struct Curl_multi *multi, int *running_handles)
{ {
CURLMcode result = multi_socket(multi, TRUE, CURL_SOCKET_BAD, 0, CURLMcode result = multi_socket(multi, TRUE, CURL_SOCKET_BAD, 0,
@ -2762,7 +2764,7 @@ static CURLMcode multi_timeout(struct Curl_multi *multi,
return CURLM_OK; return CURLM_OK;
} }
CURLMcode curl_multi_timeout(CURLM *multi, CURLMcode curl_multi_timeout(struct Curl_multi *multi,
long *timeout_ms) long *timeout_ms)
{ {
/* First, make some basic checks that the CURLM handle is a good handle */ /* First, make some basic checks that the CURLM handle is a good handle */
@ -3000,7 +3002,8 @@ void Curl_expire_latest(struct Curl_easy *data, long milli)
Curl_expire(data, milli); Curl_expire(data, milli);
} }
CURLMcode curl_multi_assign(CURLM *multi, curl_socket_t s, void *hashp) CURLMcode curl_multi_assign(struct Curl_multi *multi, curl_socket_t s,
void *hashp)
{ {
struct Curl_sh_entry *there = NULL; struct Curl_sh_entry *there = NULL;

9
lib/share.c
View File

@ -31,7 +31,7 @@
/* The last #include file should be: */ /* The last #include file should be: */
#include "memdebug.h" #include "memdebug.h"
CURLSH * struct Curl_share *
curl_share_init(void) curl_share_init(void)
{ {
struct Curl_share *share = calloc(1, sizeof(struct Curl_share)); struct Curl_share *share = calloc(1, sizeof(struct Curl_share));
@ -49,9 +49,8 @@ curl_share_init(void)
#undef curl_share_setopt #undef curl_share_setopt
CURLSHcode CURLSHcode
curl_share_setopt(CURLSH *sh, CURLSHoption option, ...) curl_share_setopt(struct Curl_share *share, CURLSHoption option, ...)
{ {
struct Curl_share *share = (struct Curl_share *)sh;
va_list param; va_list param;
int type; int type;
curl_lock_function lockfunc; curl_lock_function lockfunc;
@ -172,10 +171,8 @@ curl_share_setopt(CURLSH *sh, CURLSHoption option, ...)
} }
CURLSHcode CURLSHcode
curl_share_cleanup(CURLSH *sh) curl_share_cleanup(struct Curl_share *share)
{ {
struct Curl_share *share = (struct Curl_share *)sh;
if(share == NULL) if(share == NULL)
return CURLSHE_INVALID; return CURLSHE_INVALID;

2
lib/ssh.c
View File

@ -473,7 +473,7 @@ static CURLcode ssh_getworkingpath(struct connectdata *conn,
} }
#ifdef HAVE_LIBSSH2_KNOWNHOST_API #ifdef HAVE_LIBSSH2_KNOWNHOST_API
static int sshkeycallback(CURL *easy, static int sshkeycallback(struct Curl_easy *easy,
const struct curl_khkey *knownkey, /* known */ const struct curl_khkey *knownkey, /* known */
const struct curl_khkey *foundkey, /* found */ const struct curl_khkey *foundkey, /* found */
enum curl_khmatch match, enum curl_khmatch match,