From 51e362e6f16ce31cde9eec6e71ebc868e99c5fdf Mon Sep 17 00:00:00 2001 From: discomfitor Date: Tue, 3 Jan 2012 03:58:48 +0000 Subject: [PATCH] From: Bluezery Subject: [E-devel] [Patch][ecore_con] Fix return value checking Date: Tue, 3 Jan 2012 10:01:17 +0900 Hi, There is invalid return value checking of curl_multi_perform() in ecore_con_url. Because CURLM_CALL_MULTI_PERFORM is also not CURLM_OK, CURLM_CALL_MULTI_PERFORM checking should precede CURLM_OK checking. It's simple fix. Please review this -- BRs, Kim. git-svn-id: http://svn.enlightenment.org/svn/e/trunk/ecore@66771 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/ecore_con/ecore_con_url.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/lib/ecore_con/ecore_con_url.c b/src/lib/ecore_con/ecore_con_url.c index 68e1eac..709b554 100644 --- a/src/lib/ecore_con/ecore_con_url.c +++ b/src/lib/ecore_con/ecore_con_url.c @@ -1555,16 +1555,16 @@ _ecore_con_url_idler_handler(void *data __UNUSED__) CURLMcode ret; ret = curl_multi_perform(_curlm, &still_running); - if (ret != CURLM_OK) + if (ret == CURLM_CALL_MULTI_PERFORM) { - ERR("curl_multi_perform() failed: %s", curl_multi_strerror(ret)); - _ecore_con_url_curl_clear(); - ecore_timer_freeze(_curl_timeout); + DBG("Call multiperform again"); return ECORE_CALLBACK_RENEW; } - if (ret == CURLM_CALL_MULTI_PERFORM) + else if (ret != CURLM_OK) { - DBG("Call multiperform again"); + ERR("curl_multi_perform() failed: %s", curl_multi_strerror(ret)); + _ecore_con_url_curl_clear(); + ecore_timer_freeze(_curl_timeout); return ECORE_CALLBACK_RENEW; } -- 2.7.4