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

Move data to the first element in the callback. Ecore style. 

SVN revision: 16424
This commit is contained in:
sebastid 2005-08-30 09:32:09 +00:00 committed by sebastid
parent 2f17af26aa
commit d2d9f29e1a
3 changed files with 12 additions and 12 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

@ -164,7 +164,7 @@ extern "C" {
EAPI int ecore_con_url_send(Ecore_Con_Url *url_con, void *data, size_t length, char *content_type);
EAPI int ecore_con_dns_lookup(const char *name,
void (*done_cb)(struct hostent *hostent, void *data),
void (*done_cb)(void *data, struct hostent *hostent),
void *data);

4
legacy/ecore/src/lib/ecore_con/ecore_con.c
View File

@ -29,7 +29,7 @@
#include <time.h>
#endif
static void _ecore_con_cb_dns_lookup(struct hostent *he, void *data);
static void _ecore_con_cb_dns_lookup(void *data, struct hostent *he);
static void _ecore_con_server_free(Ecore_Con_Server *svr);
static void _ecore_con_client_free(Ecore_Con_Client *cl);
static int _ecore_con_svr_handler(void *data, Ecore_Fd_Handler *fd_handler);
@ -885,7 +885,7 @@ kill_server(Ecore_Con_Server *svr)
}
static void
_ecore_con_cb_dns_lookup(struct hostent *he, void *data)
_ecore_con_cb_dns_lookup(void *data, struct hostent *he)
{
Ecore_Con_Server *svr;
struct sockaddr_in socket_addr;

18
legacy/ecore/src/lib/ecore_con/ecore_con_dns.c
View File

@ -63,7 +63,7 @@ struct _Ecore_Con_Dns_Query {
char *searchname;
struct {
void (*cb)(struct hostent *hostent, void *data);
void (*cb)(void *data, struct hostent *hostent);
void *data;
} done;
@ -246,7 +246,7 @@ ecore_con_dns_shutdown(void)
int
ecore_con_dns_lookup(const char *name,
void (*done_cb)(struct hostent *hostent, void *data),
void (*done_cb)(void *data, struct hostent *hostent),
void *data)
{
Ecore_Con_Dns_Query *query;
@ -276,7 +276,7 @@ ecore_con_dns_lookup(const char *name,
if (!strcmp(name, current->he->h_name))
{
if (done_cb)
done_cb(current->he, data);
done_cb(data, current->he);
_cache = _ecore_list_remove(_cache, current);
_cache = _ecore_list_prepend(_cache, current);
return 1;
@ -286,7 +286,7 @@ ecore_con_dns_lookup(const char *name,
if (!strcmp(name, current->he->h_aliases[i]))
{
if (done_cb)
done_cb(current->he, data);
done_cb(data, current->he);
_cache = _ecore_list_remove(_cache, current);
_cache = _ecore_list_prepend(_cache, current);
return 1;
@ -440,7 +440,7 @@ _ecore_con_dns_timeout(void *data)
query->timeout = NULL;
if (query->done.cb)
query->done.cb(NULL, query->done.data);
query->done.cb(query->done.data, NULL);
_ecore_con_dns_query_free(query);
return 0;
}
@ -574,7 +574,7 @@ _ecore_con_cb_fd_handler(void *data, Ecore_Fd_Handler *fd_handler)
he->h_addr_list[naddrs] = NULL;
if (query->done.cb)
query->done.cb(he, query->done.data);
query->done.cb(query->done.data, he);
cache = malloc(sizeof(Ecore_Con_Dns_Cache));
if (cache)
@ -654,7 +654,7 @@ error:
else
{
if (query->done.cb)
query->done.cb(NULL, query->done.data);
query->done.cb(query->done.data, NULL);
_ecore_con_dns_query_free(query);
}
}
@ -667,7 +667,7 @@ error:
else
{
if (query->done.cb)
query->done.cb(NULL, query->done.data);
query->done.cb(query->done.data, NULL);
_ecore_con_dns_query_free(query);
}
}
@ -675,7 +675,7 @@ error:
{
/* Shutdown */
if (query->done.cb)
query->done.cb(NULL, query->done.data);
query->done.cb(query->done.data, NULL);
_ecore_con_dns_query_free(query);
}
}