summaryrefslogtreecommitdiff
path: root/src/lib/ecore_con
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2015-05-20 14:56:45 +0100
committerTom Hacohen <tom@stosb.com>2015-05-20 16:25:38 +0100
commit92fb2917cba7b91a83fbfd39b876d585921d6d3e (patch)
tree4a9aa3641cd5a3ddf706f51a262adfc405d96d9d /src/lib/ecore_con
parent7c769163d9eb122412675dca621e83ed7648e60e (diff)
Eo: Remove eo_error_set() and clean up finalizer()
This is another cleanup in perparation for the Eo stable release. This is no longer needed thanks to the proper error reporting with eo_constructor()'s new return value. The finalizer change cleans it up a bit so it catches more cases/issues. This also means that the finalizer cleans up the object in all cases, and not only some. @feature.
Diffstat (limited to 'src/lib/ecore_con')
-rw-r--r--src/lib/ecore_con/ecore_con_url.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/ecore_con/ecore_con_url.c b/src/lib/ecore_con/ecore_con_url.c
index 021b6f22df..348785ce1e 100644
--- a/src/lib/ecore_con/ecore_con_url.c
+++ b/src/lib/ecore_con/ecore_con_url.c
@@ -458,17 +458,16 @@ _efl_network_url_eo_base_constructor(Efl_Network_Url *url_obj, Efl_Network_Url_D
458{ 458{
459 url_obj = eo_do_super_ret(url_obj, MY_CLASS, url_obj, eo_constructor()); 459 url_obj = eo_do_super_ret(url_obj, MY_CLASS, url_obj, eo_constructor());
460 460
461 if (!_init_count) eo_error_set(url_obj); 461 if (!_init_count || !_c_init())
462 if (!_c_init())
463 { 462 {
464 eo_error_set(url_obj); 463 ERR("Failed");
465 return NULL; 464 return NULL;
466 } 465 }
467 466
468 url_con->curl_easy = _c->curl_easy_init(); 467 url_con->curl_easy = _c->curl_easy_init();
469 if (!url_con->curl_easy) 468 if (!url_con->curl_easy)
470 { 469 {
471 eo_error_set(url_obj); 470 ERR("Failed");
472 return NULL; 471 return NULL;
473 } 472 }
474 473