Enlightenment CVS committal
Author : sebastid
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_con
Modified Files:
Ecore_Con.h ecore_con.c ecore_con_dns.c
Log Message:
Move data to the first element in the callback. Ecore style.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_con/Ecore_Con.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- Ecore_Con.h 24 Aug 2005 09:11:30 -0000 1.11
+++ Ecore_Con.h 30 Aug 2005 09:32:08 -0000 1.12
@@ -164,7 +164,7 @@
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);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_con/ecore_con.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -3 -r1.48 -r1.49
--- ecore_con.c 24 Aug 2005 16:29:06 -0000 1.48
+++ ecore_con.c 30 Aug 2005 09:32:09 -0000 1.49
@@ -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 @@
}
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;
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_con/ecore_con_dns.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- ecore_con_dns.c 30 Aug 2005 04:50:55 -0000 1.15
+++ ecore_con_dns.c 30 Aug 2005 09:32:09 -0000 1.16
@@ -63,7 +63,7 @@
char *searchname;
struct {
- void (*cb)(struct hostent *hostent, void *data);
+ void (*cb)(void *data, struct hostent *hostent);
void *data;
} done;
@@ -246,7 +246,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
{
/* 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);
}
}
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
