smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Better variable name for outStream.

This commit is contained in:
Matthieu Gautier 2020-08-26 12:40:14 +02:00
parent ea3180cb8c
commit 470bfc3f1f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/aria2.cpp
View File

@ -126,15 +126,15 @@ void Aria2::close()
size_t write_callback_to_iss(char* ptr, size_t size, size_t nmemb, void* userdata) size_t write_callback_to_iss(char* ptr, size_t size, size_t nmemb, void* userdata)
{ {
auto str = static_cast<std::stringstream*>(userdata); auto outStream = static_cast<std::stringstream*>(userdata);
str->write(ptr, nmemb); outStream->write(ptr, nmemb);
return nmemb; return nmemb;
} }
std::string Aria2::doRequest(const MethodCall& methodCall) std::string Aria2::doRequest(const MethodCall& methodCall)
{ {
auto requestContent = methodCall.toString(); auto requestContent = methodCall.toString();
std::stringstream stringstream; std::stringstream outStream;
CURLcode res; CURLcode res;
long response_code; long response_code;
{ {
@ -142,7 +142,7 @@ std::string Aria2::doRequest(const MethodCall& methodCall)
curl_easy_setopt(mp_curl, CURLOPT_POSTFIELDSIZE, requestContent.size()); curl_easy_setopt(mp_curl, CURLOPT_POSTFIELDSIZE, requestContent.size());
curl_easy_setopt(mp_curl, CURLOPT_POSTFIELDS, requestContent.c_str()); curl_easy_setopt(mp_curl, CURLOPT_POSTFIELDS, requestContent.c_str());
curl_easy_setopt(mp_curl, CURLOPT_WRITEFUNCTION, &write_callback_to_iss); curl_easy_setopt(mp_curl, CURLOPT_WRITEFUNCTION, &write_callback_to_iss);
curl_easy_setopt(mp_curl, CURLOPT_WRITEDATA, &stringstream); curl_easy_setopt(mp_curl, CURLOPT_WRITEDATA, &outStream);
m_curlErrorBuffer[0] = 0; m_curlErrorBuffer[0] = 0;
res = curl_easy_perform(mp_curl); res = curl_easy_perform(mp_curl);
if (res != CURLE_OK) { if (res != CURLE_OK) {
@ -152,7 +152,7 @@ std::string Aria2::doRequest(const MethodCall& methodCall)
curl_easy_getinfo(mp_curl, CURLINFO_RESPONSE_CODE, &response_code); curl_easy_getinfo(mp_curl, CURLINFO_RESPONSE_CODE, &response_code);
} }
auto responseContent = stringstream.str(); auto responseContent = outStream.str();
if (response_code != 200) { if (response_code != 200) {
std::cerr << "ERROR: Invalid return code (" << response_code << ") from aria :" << std::endl; std::cerr << "ERROR: Invalid return code (" << response_code << ") from aria :" << std::endl;
std::cerr << responseContent << std::endl; std::cerr << responseContent << std::endl;