diff options
| author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-01-14 16:25:27 (GMT) |
|---|---|---|
| committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-01-14 16:25:27 (GMT) |
| commit | a768843810b1e6f9ce6ad2ec078f6544ffa3266d (patch) | |
| tree | 01384ff5893d9b0c8b3c3c9bc6e962c6577d885e /src | |
| parent | 175adb1fc78926c070494dc244e27fc42f71f1d4 (diff) | |
| download | uscxml-a768843810b1e6f9ce6ad2ec078f6544ffa3266d.zip uscxml-a768843810b1e6f9ce6ad2ec078f6544ffa3266d.tar.gz uscxml-a768843810b1e6f9ce6ad2ec078f6544ffa3266d.tar.bz2 | |
Fixed the mess that was the last commit
Diffstat (limited to 'src')
| -rw-r--r-- | src/uscxml/URL.cpp | 17 | ||||
| -rw-r--r-- | src/uscxml/plugins/invoker/expect/ExpectInvoker.cpp | 1 |
2 files changed, 3 insertions, 15 deletions
diff --git a/src/uscxml/URL.cpp b/src/uscxml/URL.cpp index 7948b3b..f638d06 100644 --- a/src/uscxml/URL.cpp +++ b/src/uscxml/URL.cpp @@ -745,7 +745,7 @@ void URLFetcher::perform() { while ((msg = curl_multi_info_read(_multiHandle, &msgsLeft))) { if (msg->msg == CURLMSG_DONE) { switch (msg->data.result) { - case CURLM_OK: + case CURLE_OK: _handlesToURLs[msg->easy_handle].downloadCompleted(); err = curl_multi_remove_handle(_multiHandle, msg->easy_handle); if (err != CURLM_OK) { @@ -754,25 +754,14 @@ void URLFetcher::perform() { _handlesToURLs.erase(msg->easy_handle); break; - case CURLM_BAD_HANDLE: - case CURLM_BAD_EASY_HANDLE: - case CURLE_FILE_COULDNT_READ_FILE: - case CURLE_COULDNT_CONNECT: - case CURLM_OUT_OF_MEMORY: - case CURLM_INTERNAL_ERROR: - case CURLM_BAD_SOCKET: - case CURLM_UNKNOWN_OPTION: - case CURLM_LAST: + default: _handlesToURLs[msg->easy_handle].downloadFailed(msg->data.result); err = curl_multi_remove_handle(_multiHandle, msg->easy_handle); if (err != CURLM_OK) { LOG(WARNING) << "curl_multi_remove_handle: " << curl_multi_strerror(err); } - + _handlesToURLs.erase(msg->easy_handle); - break; - default: - LOG(ERROR) << "Unhandled curl status"; } } else { LOG(ERROR) << "Curl reports info on unfinished download?!"; diff --git a/src/uscxml/plugins/invoker/expect/ExpectInvoker.cpp b/src/uscxml/plugins/invoker/expect/ExpectInvoker.cpp index c66005f..222624a 100644 --- a/src/uscxml/plugins/invoker/expect/ExpectInvoker.cpp +++ b/src/uscxml/plugins/invoker/expect/ExpectInvoker.cpp @@ -45,7 +45,6 @@ ExpectInvoker::ExpectInvoker() : _eventQueue(NULL) { ExpectInvoker::~ExpectInvoker() { _eventQueue->stop(); - exp_cl // if (_tcl) { // Tcl_DeleteInterp(_tcl); // } |