borisfaure
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

formatting. 

SVN revision: 31825
This commit is contained in:
Sebastian Dransfeld 2007-09-26 17:18:52 +00:00
parent 394664a09a
commit 3a84f04c4f
3 changed files with 66 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
legacy/ecore/src/lib/ecore_con/Ecore_Con.h
View File

@ -189,7 +189,7 @@ extern "C" {
EAPI int ecore_con_url_shutdown(void); EAPI int ecore_con_url_shutdown(void);
EAPI Ecore_Con_Url *ecore_con_url_new(const char *url); EAPI Ecore_Con_Url *ecore_con_url_new(const char *url);
EAPI void ecore_con_url_destroy(Ecore_Con_Url *url_con); EAPI void ecore_con_url_destroy(Ecore_Con_Url *url_con);
EAPI void ecore_con_url_data_set(Ecore_Con_Url *url_con, const void *data); EAPI void ecore_con_url_data_set(Ecore_Con_Url *url_con, void *data);
EAPI void *ecore_con_url_data_get(Ecore_Con_Url *url_con); EAPI void *ecore_con_url_data_get(Ecore_Con_Url *url_con);
EAPI int ecore_con_url_url_set(Ecore_Con_Url *url_con, const char *url); EAPI int ecore_con_url_url_set(Ecore_Con_Url *url_con, const char *url);
EAPI int ecore_con_url_send(Ecore_Con_Url *url_con, void *data, size_t length, char *content_type); EAPI int ecore_con_url_send(Ecore_Con_Url *url_con, void *data, size_t length, char *content_type);

2
legacy/ecore/src/lib/ecore_con/ecore_con_private.h
View File

@ -74,7 +74,7 @@ struct _Ecore_Con_Url
Ecore_Con_Url_Time condition; Ecore_Con_Url_Time condition;
time_t time; time_t time;
const void *data; void *data;
Ecore_Fd_Handler *fd_handler; Ecore_Fd_Handler *fd_handler;

125
legacy/ecore/src/lib/ecore_con/ecore_con_url.c
View File

@ -58,17 +58,17 @@ static Ecore_List *_url_con_list = NULL;
static fd_set _current_fd_set; static fd_set _current_fd_set;
static int init_count = 0; static int init_count = 0;
struct _little_ecore_con_url_event_s struct _Ecore_Con_Url_Event
{ {
int type; int type;
void *ev; void *ev;
}; };
typedef struct _little_ecore_con_url_event_s _little_ecore_con_url_event_t; typedef struct _Ecore_Con_Url_Event Ecore_Con_Url_Event;
static int static int
_url_complete_idler_cb(void *data) _url_complete_idler_cb(void *data)
{ {
_little_ecore_con_url_event_t *lev; Ecore_Con_Url_Event *lev;
lev = data; lev = data;
@ -81,9 +81,9 @@ _url_complete_idler_cb(void *data)
static void static void
_url_complete_push_event(int type, void *ev) _url_complete_push_event(int type, void *ev)
{ {
_little_ecore_con_url_event_t *lev; Ecore_Con_Url_Event *lev;
lev = malloc(sizeof (_little_ecore_con_url_event_t)); lev = malloc(sizeof(Ecore_Con_Url_Event));
lev->type = type; lev->type = type;
lev->ev = ev; lev->ev = ev;
@ -100,8 +100,8 @@ ecore_con_url_init(void)
{ {
ECORE_CON_EVENT_URL_DATA = ecore_event_type_new(); ECORE_CON_EVENT_URL_DATA = ecore_event_type_new();
ECORE_CON_EVENT_URL_COMPLETE = ecore_event_type_new(); ECORE_CON_EVENT_URL_COMPLETE = ecore_event_type_new();
ECORE_CON_EVENT_URL_PROGRESS_DOWNLOAD = ecore_event_type_new(); ECORE_CON_EVENT_URL_PROGRESS_DOWNLOAD = ecore_event_type_new();
ECORE_CON_EVENT_URL_PROGRESS_UPLOAD = ecore_event_type_new(); ECORE_CON_EVENT_URL_PROGRESS_UPLOAD = ecore_event_type_new();
} }
if (!_url_con_list) if (!_url_con_list)
@ -208,8 +208,8 @@ ecore_con_url_new(const char *url)
return url_con; return url_con;
#else #else
url = NULL;
return NULL; return NULL;
url = NULL;
#endif #endif
} }
@ -220,8 +220,8 @@ ecore_con_url_destroy(Ecore_Con_Url *url_con)
if (!url_con) return; if (!url_con) return;
if (!ECORE_MAGIC_CHECK(url_con, ECORE_MAGIC_CON_URL)) if (!ECORE_MAGIC_CHECK(url_con, ECORE_MAGIC_CON_URL))
{ {
ECORE_MAGIC_FAIL(url_con, ECORE_MAGIC_CON_URL, "ecore_con_url_destroy"); ECORE_MAGIC_FAIL(url_con, ECORE_MAGIC_CON_URL, "ecore_con_url_destroy");
return ; return;
} }
ECORE_MAGIC_SET(url_con, ECORE_MAGIC_NONE); ECORE_MAGIC_SET(url_con, ECORE_MAGIC_NONE);
@ -237,6 +237,7 @@ ecore_con_url_destroy(Ecore_Con_Url *url_con)
free(url_con->url); free(url_con->url);
free(url_con); free(url_con);
#else #else
return;
url_con = NULL; url_con = NULL;
#endif #endif
} }
@ -247,8 +248,8 @@ ecore_con_url_url_set(Ecore_Con_Url *url_con, const char *url)
#ifdef HAVE_CURL #ifdef HAVE_CURL
if (!ECORE_MAGIC_CHECK(url_con, ECORE_MAGIC_CON_URL)) if (!ECORE_MAGIC_CHECK(url_con, ECORE_MAGIC_CON_URL))
{ {
ECORE_MAGIC_FAIL(url_con, ECORE_MAGIC_CON_URL, "ecore_con_url_url_set"); ECORE_MAGIC_FAIL(url_con, ECORE_MAGIC_CON_URL, "ecore_con_url_url_set");
return 0; return 0;
} }
if (url_con->active) return 0; if (url_con->active) return 0;
@ -258,47 +259,46 @@ ecore_con_url_url_set(Ecore_Con_Url *url_con, const char *url)
if (url) if (url)
url_con->url = strdup(url); url_con->url = strdup(url);
curl_easy_setopt(url_con->curl_easy, CURLOPT_URL, url_con->url); curl_easy_setopt(url_con->curl_easy, CURLOPT_URL, url_con->url);
return 1;
#else #else
return 0;
url_con = NULL; url_con = NULL;
url = NULL; url = NULL;
#endif #endif
return 1;
} }
EAPI void EAPI void
ecore_con_url_data_set(Ecore_Con_Url *url_con, const void *data) ecore_con_url_data_set(Ecore_Con_Url *url_con, void *data)
{ {
#ifdef HAVE_CURL #ifdef HAVE_CURL
if (!ECORE_MAGIC_CHECK(url_con, ECORE_MAGIC_CON_URL)) if (!ECORE_MAGIC_CHECK(url_con, ECORE_MAGIC_CON_URL))
{ {
ECORE_MAGIC_FAIL(url_con, ECORE_MAGIC_CON_URL, "ecore_con_url_data_set"); ECORE_MAGIC_FAIL(url_con, ECORE_MAGIC_CON_URL, "ecore_con_url_data_set");
return ; return;
} }
url_con->data = data; url_con->data = data;
#else #else
(void*) url_con; return;
(const void*) data; url_con = NULL;
data = NULL;
return ;
#endif #endif
} }
EAPI void* EAPI void *
ecore_con_url_data_get(Ecore_Con_Url *url_con) ecore_con_url_data_get(Ecore_Con_Url *url_con)
{ {
#ifdef HAVE_CURL #ifdef HAVE_CURL
if (!ECORE_MAGIC_CHECK(url_con, ECORE_MAGIC_CON_URL)) if (!ECORE_MAGIC_CHECK(url_con, ECORE_MAGIC_CON_URL))
{ {
ECORE_MAGIC_FAIL(url_con, ECORE_MAGIC_CON_URL, "ecore_con_url_data_get"); ECORE_MAGIC_FAIL(url_con, ECORE_MAGIC_CON_URL, "ecore_con_url_data_get");
return NULL; return NULL;
} }
return (void*) url_con->data; return url_con->data;
#else #else
(void*) url_con;
return NULL; return NULL;
url_con = NULL;
#endif #endif
} }
@ -308,16 +308,17 @@ ecore_con_url_time(Ecore_Con_Url *url_con, Ecore_Con_Url_Time condition, time_t
#ifdef HAVE_CURL #ifdef HAVE_CURL
if (!ECORE_MAGIC_CHECK(url_con, ECORE_MAGIC_CON_URL)) if (!ECORE_MAGIC_CHECK(url_con, ECORE_MAGIC_CON_URL))
{ {
ECORE_MAGIC_FAIL(url_con, ECORE_MAGIC_CON_URL, "ecore_con_url_time"); ECORE_MAGIC_FAIL(url_con, ECORE_MAGIC_CON_URL, "ecore_con_url_time");
return ; return;
} }
url_con->condition = condition; url_con->condition = condition;
url_con->time = tm; url_con->time = tm;
#else #else
(void*) url_con; return;
condition; url_con = NULL;
tm; condition = 0;
tm = 0;
#endif #endif
} }
@ -329,8 +330,8 @@ ecore_con_url_send(Ecore_Con_Url *url_con, void *data, size_t length, char *cont
if (!ECORE_MAGIC_CHECK(url_con, ECORE_MAGIC_CON_URL)) if (!ECORE_MAGIC_CHECK(url_con, ECORE_MAGIC_CON_URL))
{ {
ECORE_MAGIC_FAIL(url_con, ECORE_MAGIC_CON_URL, "ecore_con_url_send"); ECORE_MAGIC_FAIL(url_con, ECORE_MAGIC_CON_URL, "ecore_con_url_send");
return 0; return 0;
} }
if (url_con->active) return 0; if (url_con->active) return 0;
@ -356,31 +357,31 @@ ecore_con_url_send(Ecore_Con_Url *url_con, void *data, size_t length, char *cont
switch (url_con->condition) switch (url_con->condition)
{ {
case ECORE_CON_URL_TIME_NONE: case ECORE_CON_URL_TIME_NONE:
curl_easy_setopt(url_con->curl_easy, CURLOPT_TIMECONDITION, CURL_TIMECOND_NONE); curl_easy_setopt(url_con->curl_easy, CURLOPT_TIMECONDITION, CURL_TIMECOND_NONE);
break; break;
case ECORE_CON_URL_TIME_IFMODSINCE: case ECORE_CON_URL_TIME_IFMODSINCE:
curl_easy_setopt(url_con->curl_easy, CURLOPT_TIMECONDITION, CURL_TIMECOND_IFMODSINCE); curl_easy_setopt(url_con->curl_easy, CURLOPT_TIMECONDITION, CURL_TIMECOND_IFMODSINCE);
curl_easy_setopt(url_con->curl_easy, CURLOPT_TIMEVALUE, url_con->time); curl_easy_setopt(url_con->curl_easy, CURLOPT_TIMEVALUE, url_con->time);
break; break;
case ECORE_CON_URL_TIME_IFUNMODSINCE: case ECORE_CON_URL_TIME_IFUNMODSINCE:
curl_easy_setopt(url_con->curl_easy, CURLOPT_TIMECONDITION, CURL_TIMECOND_IFUNMODSINCE); curl_easy_setopt(url_con->curl_easy, CURLOPT_TIMECONDITION, CURL_TIMECOND_IFUNMODSINCE);
curl_easy_setopt(url_con->curl_easy, CURLOPT_TIMEVALUE, url_con->time); curl_easy_setopt(url_con->curl_easy, CURLOPT_TIMEVALUE, url_con->time);
break; break;
case ECORE_CON_URL_TIME_LASTMOD: case ECORE_CON_URL_TIME_LASTMOD:
curl_easy_setopt(url_con->curl_easy, CURLOPT_TIMECONDITION, CURL_TIMECOND_LASTMOD); curl_easy_setopt(url_con->curl_easy, CURLOPT_TIMECONDITION, CURL_TIMECOND_LASTMOD);
curl_easy_setopt(url_con->curl_easy, CURLOPT_TIMEVALUE, url_con->time); curl_easy_setopt(url_con->curl_easy, CURLOPT_TIMEVALUE, url_con->time);
break; break;
} }
curl_easy_setopt(url_con->curl_easy, CURLOPT_HTTPHEADER, url_con->headers); curl_easy_setopt(url_con->curl_easy, CURLOPT_HTTPHEADER, url_con->headers);
return _ecore_con_url_perform(url_con); return _ecore_con_url_perform(url_con);
#else #else
return 0;
url_con = NULL; url_con = NULL;
data = NULL; data = NULL;
length = 0; length = 0;
content_type = NULL; content_type = NULL;
return 0;
#endif #endif
} }
@ -398,7 +399,7 @@ _ecore_con_url_data_cb(void *buffer, size_t size, size_t nmemb, void *userp)
{ {
e->url_con = url_con; e->url_con = url_con;
e->size = real_size; e->size = real_size;
memcpy(e->data, buffer, real_size); memcpy(e->data, buffer, real_size);
ecore_event_add(ECORE_CON_EVENT_URL_DATA, e, ecore_event_add(ECORE_CON_EVENT_URL_DATA, e,
_ecore_con_event_url_free, NULL); _ecore_con_event_url_free, NULL);
} }
@ -406,18 +407,20 @@ _ecore_con_url_data_cb(void *buffer, size_t size, size_t nmemb, void *userp)
} }
#define ECORE_CON_URL_TRANSMISSION(Transmit, Event, Url_con, Total, Now) \ #define ECORE_CON_URL_TRANSMISSION(Transmit, Event, Url_con, Total, Now) \
{ \ { \
Ecore_Con_Event_Url_Progress *e; \ Ecore_Con_Event_Url_Progress *e; \
if (Total != 0 || Now != 0) { \ if ((Total != 0) || (Now != 0)) \
e = calloc(1, sizeof(Ecore_Con_Event_Url_Progress)); \ { \
if (e) { \ e = calloc(1, sizeof(Ecore_Con_Event_Url_Progress)); \
e->url_con = url_con; \ if (e) \
e->total = Total; \ { \
e->now = Now; \ e->url_con = url_con; \
ecore_event_add(Event, e, _ecore_con_event_url_free, NULL); \ e->total = Total; \
} \ e->now = Now; \
} \ ecore_event_add(Event, e, _ecore_con_event_url_free, NULL); \
} } \
} \
}
static int static int
_ecore_con_url_progress_cb(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow) _ecore_con_url_progress_cb(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow)
@ -539,10 +542,10 @@ _ecore_con_url_process_completed_jobs(Ecore_Con_Url *url_con_to_match)
{ {
e->url_con = url_con; e->url_con = url_con;
e->status = 0; e->status = 0;
curl_easy_getinfo(curlmsg->easy_handle, CURLINFO_RESPONSE_CODE, &e->status); curl_easy_getinfo(curlmsg->easy_handle, CURLINFO_RESPONSE_CODE, &e->status);
_url_complete_push_event(ECORE_CON_EVENT_URL_COMPLETE, e); _url_complete_push_event(ECORE_CON_EVENT_URL_COMPLETE, e);
} }
} }
curl_multi_remove_handle(curlm, url_con->curl_easy); curl_multi_remove_handle(curlm, url_con->curl_easy);