From 7d989e96c415ba8bfd75580006722e5461ba6daf Mon Sep 17 00:00:00 2001 From: caro Date: Sun, 22 Mar 2009 13:27:24 +0000 Subject: [PATCH] remove trailing spaces git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/ecore@39624 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/ecore_con/ecore_con.c | 16 ++++++++-------- src/lib/ecore_con/ecore_con_dns.c | 20 ++++++++++---------- src/lib/ecore_con/ecore_con_url.c | 32 ++++++++++++++++---------------- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c index 2fe1a33..1be24d0 100644 --- a/src/lib/ecore_con/ecore_con.c +++ b/src/lib/ecore_con/ecore_con.c @@ -1317,13 +1317,13 @@ _ecore_con_cl_handler(void *data, Ecore_Fd_Handler *fd_handler) } /* #if USE_OPENSSL */ -/* if (svr->fd_handler) */ -/* { */ -/* if (svr->ssl && ssl_err == SSL_ERROR_WANT_READ) */ -/* ecore_main_fd_handler_active_set(svr->fd_handler, ECORE_FD_READ); */ -/* else if (svr->ssl && ssl_err == SSL_ERROR_WANT_WRITE) */ -/* ecore_main_fd_handler_active_set(svr->fd_handler, ECORE_FD_WRITE); */ -/* } */ +/* if (svr->fd_handler) */ +/* { */ +/* if (svr->ssl && ssl_err == SSL_ERROR_WANT_READ) */ +/* ecore_main_fd_handler_active_set(svr->fd_handler, ECORE_FD_READ); */ +/* else if (svr->ssl && ssl_err == SSL_ERROR_WANT_WRITE) */ +/* ecore_main_fd_handler_active_set(svr->fd_handler, ECORE_FD_WRITE); */ +/* } */ /* #endif */ } else if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_WRITE)) @@ -1541,7 +1541,7 @@ _ecore_con_svr_cl_handler(void *data, Ecore_Fd_Handler *fd_handler) if (inbuf && !cl->delete_me) { Ecore_Con_Event_Client_Data *e; - + e = calloc(1, sizeof(Ecore_Con_Event_Client_Data)); if (e) { diff --git a/src/lib/ecore_con/ecore_con_dns.c b/src/lib/ecore_con/ecore_con_dns.c index d8b58cb..0b7b29b 100644 --- a/src/lib/ecore_con/ecore_con_dns.c +++ b/src/lib/ecore_con/ecore_con_dns.c @@ -2,7 +2,7 @@ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ -/* +/* * Simple dns lookup * * http://www.faqs.org/rfcs/rfc1035.html @@ -64,7 +64,7 @@ static int _ecore_con_dns_exit_handler(void *data, int type __UNUSED__, void *ev static int dns_init = 0; static Ecore_List2 *dns_slaves = NULL; - + int ecore_con_dns_init(void) { @@ -90,7 +90,7 @@ ecore_con_dns_lookup(const char *name, { CB_Data *cbdata; int fd[2]; - + if (pipe(fd) < 0) return 0; cbdata = calloc(1, sizeof(CB_Data)); if (!cbdata) @@ -102,7 +102,7 @@ ecore_con_dns_lookup(const char *name, cbdata->cb_done = done_cb; cbdata->data = data; cbdata->fd2 = fd[1]; - if (!(cbdata->fdh = ecore_main_fd_handler_add(fd[0], ECORE_FD_READ, + if (!(cbdata->fdh = ecore_main_fd_handler_add(fd[0], ECORE_FD_READ, _ecore_con_dns_data_handler, cbdata, NULL, NULL))) @@ -112,17 +112,17 @@ ecore_con_dns_lookup(const char *name, close(fd[1]); return 0; } - + if ((cbdata->pid = fork()) == 0) { struct hostent *he; - + /* CHILD */ he = gethostbyname(name); if (he) { struct in_addr addr; - + memcpy((struct in_addr *)&addr, he->h_addr, sizeof(struct in_addr)); write(fd[1], &(addr.s_addr), sizeof(in_addr_t)); @@ -134,9 +134,9 @@ ecore_con_dns_lookup(const char *name, close(fd[1]); # ifdef __USE_ISOC99 _Exit(0); -# else +# else _exit(0); -# endif +# endif } /* PARENT */ cbdata->handler = ecore_event_handler_add(ECORE_EXE_EVENT_DEL, _ecore_con_dns_exit_handler, cbdata); @@ -210,7 +210,7 @@ _ecore_con_dns_exit_handler(void *data, int type __UNUSED__, void *event) { CB_Data *cbdata; Ecore_Exe_Event_Del *ev; - + ev = event; cbdata = data; if (cbdata->pid != ev->pid) return 1; diff --git a/src/lib/ecore_con/ecore_con_url.c b/src/lib/ecore_con/ecore_con_url.c index ef68bca..1c2b77b 100644 --- a/src/lib/ecore_con/ecore_con_url.c +++ b/src/lib/ecore_con/ecore_con_url.c @@ -20,7 +20,7 @@ * bear in mind that each one can only perform one operation at a time. * You need to wait for the ECORE_CON_EVENT_URL_COMPLETE event before re-using * or destroying the object. - * + * * Example Usage 1 (HTTP GET): * ecore_con_url_url_set(url_con, "http://www.google.com"); * ecore_con_url_send(url_con, NULL, 0, NULL); @@ -61,7 +61,7 @@ /** * @defgroup Ecore_Con_Url_Group Ecore URL Connection Functions * - * Utility functions that set up, use and shut down the Ecore URL + * Utility functions that set up, use and shut down the Ecore URL * Connection library. * FIXME: write detailed description */ @@ -244,7 +244,7 @@ ecore_con_url_new(const char *url) /** * Frees the Ecore_Con_Url. - * @return FIXME: To be documented. + * @return FIXME: To be documented. * @ingroup Ecore_Con_Url_Group */ EAPI void @@ -399,7 +399,7 @@ ecore_con_url_fd_set(Ecore_Con_Url *url_con, int fd) return ; } url_con->write_fd = fd; -#endif +#endif } /** @@ -418,7 +418,7 @@ ecore_con_url_received_bytes_get(Ecore_Con_Url *url_con) } return url_con->received; -#endif +#endif return 0; } @@ -497,7 +497,7 @@ ecore_con_url_send(Ecore_Con_Url *url_con, const void *data, size_t length, cons * @return FIXME: To be more documented. * @ingroup Ecore_Con_Url_Group */ -EAPI int +EAPI int ecore_con_url_ftp_upload(Ecore_Con_Url *url_con, const char *filename, const char *user, const char *pass, const char *upload_dir) { #ifdef HAVE_CURL @@ -505,13 +505,13 @@ ecore_con_url_ftp_upload(Ecore_Con_Url *url_con, const char *filename, const cha char userpwd[4096]; FILE *fd; struct stat file_info; - + if (!ECORE_MAGIC_CHECK(url_con, ECORE_MAGIC_CON_URL)) { ECORE_MAGIC_FAIL(url_con, ECORE_MAGIC_CON_URL, "ecore_con_url_ftp_upload"); return 0; } - + if (url_con->active) return 0; if (!url_con->url) return 0; if (filename) @@ -541,7 +541,7 @@ ecore_con_url_ftp_upload(Ecore_Con_Url *url_con, const char *filename, const cha user = NULL; pass = NULL; upload_dir = NULL; -#endif +#endif } /** @@ -558,12 +558,12 @@ ecore_con_url_verbose_set(Ecore_Con_Url *url_con, int verbose) ECORE_MAGIC_FAIL(url_con, ECORE_MAGIC_CON_URL, "ecore_con_url_verbose_set"); return; } - + if (url_con->active) return; if (!url_con->url) return; - if (verbose == TRUE) + if (verbose == TRUE) curl_easy_setopt(url_con->curl_easy, CURLOPT_VERBOSE, 1); - else + else curl_easy_setopt(url_con->curl_easy, CURLOPT_VERBOSE, 0); #endif } @@ -582,12 +582,12 @@ ecore_con_url_ftp_use_epsv_set(Ecore_Con_Url *url_con, int use_epsv) ECORE_MAGIC_FAIL(url_con, ECORE_MAGIC_CON_URL, "ecore_con_url_ftp_use_epsv_set"); return; } - + if (url_con->active) return; if (!url_con->url) return; - if (use_epsv == TRUE) + if (use_epsv == TRUE) curl_easy_setopt(url_con->curl_easy, CURLOPT_FTP_USE_EPSV, 1); - else + else curl_easy_setopt(url_con->curl_easy, CURLOPT_FTP_USE_EPSV, 0); #endif } @@ -734,7 +734,7 @@ _ecore_con_url_progress_cb(void *clientp, double dltotal, double dlnow, double u return 0; } -static size_t +static size_t _ecore_con_url_read_cb(void *ptr, size_t size, size_t nitems, void *stream) { size_t retcode = fread(ptr, size, nitems, stream); -- 2.7.4