orthanc: Core/HttpClient.cpp comparison

rename

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Sat, 18 Jun 2016 10:05:47 +0200
parents	fefbe71c2272
children	944b255035a0

comparison

equal deleted inserted replaced

-:fefbe71c2272
+:7fe860db9664
 return code;
 }
-static size_t CurlCallback(void *buffer, size_t size, size_t nmemb, void *payload)
+static size_t CurlBodyCallback(void *buffer, size_t size, size_t nmemb, void *payload)
 {
 std::string& target = *(static_cast<std::string*>(payload));
 size_t length = size * nmemb;
 if (length == 0)
 {
 curl_slist_free_all(pimpl_->defaultPostHeaders_);
 throw OrthancException(ErrorCode_NotEnoughMemory);
 }
-CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_WRITEFUNCTION, &CurlCallback));
+CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_WRITEFUNCTION, &CurlBodyCallback));
 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_HEADER, 0));
 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_FOLLOWLOCATION, 1));
 // This fixes the "longjmp causes uninitialized stack frame" crash
 // that happens on modern Linux versions.
 pimpl_->userHeaders_ = NULL;
 }
 }
-bool HttpClient::Apply(std::string& answer)
+bool HttpClient::ApplyInternal(std::string& answer)
 {
 answer.clear();
 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_URL, url_.c_str()));
 CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_WRITEDATA, &answer));
 return success;
 }
+bool HttpClient::Apply(std::string& answer)
+{
+return ApplyInternal(answer);
+}
 bool HttpClient::Apply(Json::Value& answer)
 {
 std::string s;
 if (Apply(s))
 {

Mercurial > hg > orthanc