Enlightenment CVS committal
Author : sebastid
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_con
Modified Files:
ecore_con_url.c
Log Message:
indent
Check if the lib is inited before allowing ecore_con_url_new. Then we
don't need to check if the global variables are set.
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_con/ecore_con_url.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ecore_con_url.c 24 Jun 2005 14:31:51 -0000 1.3
+++ ecore_con_url.c 24 Jun 2005 14:39:25 -0000 1.4
@@ -139,6 +139,8 @@
#ifdef HAVE_CURL
Ecore_Con_Url *url_con;
+ if (!init_count) return NULL;
+
url_con = calloc(1, sizeof(Ecore_Con_Url));
if (!url_con) return NULL;
@@ -256,7 +258,7 @@
e->data = buffer;
e->size = real_size;
ecore_event_add(ECORE_CON_EVENT_URL_DATA, e,
- _ecore_con_event_url_data_free, NULL);
+ _ecore_con_event_url_data_free, NULL);
}
return real_size;
}
@@ -306,16 +308,15 @@
{
FD_SET(fd, &_current_fd_set);
url_con->fd_handler = ecore_main_fd_handler_add(fd,
flags,
- _ecore_con_url_fd_handler,
- NULL, NULL, NULL);
+
_ecore_con_url_fd_handler,
+ NULL,
NULL, NULL);
}
}
}
if (!url_con->fd_handler)
{
/* Failed to set up an fd_handler */
- if (curlm)
- curl_multi_remove_handle(curlm, url_con->curl_easy);
+ curl_multi_remove_handle(curlm, url_con->curl_easy);
url_con->active = 0;
return 0;
}
@@ -362,7 +363,7 @@
if (url_con->fd_handler)
{
FD_CLR(ecore_main_fd_handler_fd_get(url_con->fd_handler),
- &_current_fd_set);
+ &_current_fd_set);
ecore_main_fd_handler_del(url_con->fd_handler);
}
ecore_list_remove(_url_con_list);
@@ -375,7 +376,8 @@
{
e->url_con = url_con;
e->status = curlmsg->data.result;
- ecore_event_add(ECORE_CON_EVENT_URL_COMPLETE, e,
_ecore_con_event_url_complete_free, NULL);
+ ecore_event_add(ECORE_CON_EVENT_URL_COMPLETE, e,
+ _ecore_con_event_url_complete_free,
NULL);
}
}
break;
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
