Skip to content

Commit

Permalink
fmt conversions
Browse files Browse the repository at this point in the history
Signed-off-by: Rosen Penev <rosenp@gmail.com>
  • Loading branch information
neheb committed Nov 26, 2023
1 parent f1da4e6 commit 5b14d75
Showing 1 changed file with 7 additions and 22 deletions.
29 changes: 7 additions & 22 deletions src/basicio.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -929,9 +929,7 @@ std::string XPathIo::writeDataToFile(const std::string& orgPath) {

// generating the name for temp file.
std::time_t timestamp = std::time(nullptr);
std::stringstream ss;
ss << timestamp << XPathIo::TEMP_FILE_EXT;
std::string path = ss.str();
auto path = stringFormat("{}{}", timestamp, XPathIo::TEMP_FILE_EXT);

if (prot == pStdin) {
if (isatty(fileno(stdin)))
Expand Down Expand Up @@ -1437,9 +1435,8 @@ void HttpIo::HttpImpl::getDataByRange(size_t lowBlock, size_t highBlock, std::st
request["verb"] = "GET";
std::string errors;
if (lowBlock != std::numeric_limits<size_t>::max() && highBlock != std::numeric_limits<size_t>::max()) {
std::stringstream ss;
ss << "Range: bytes=" << lowBlock * blockSize_ << "-" << ((highBlock + 1) * blockSize_ - 1) << "\r\n";
request["header"] = ss.str();
auto ss = stringFormat("Range: bytes={}-{}", lowBlock * blockSize_, ((highBlock + 1) * blockSize_ - 1));
request["header"] = ss;
}

int serverCode = http(request, responseDic, errors);
Expand Down Expand Up @@ -1480,15 +1477,10 @@ void HttpIo::HttpImpl::writeRemote(const byte* data, size_t size, size_t from, s
// url encode
const std::string urlencodeData = urlencode(encodeData.data());

std::stringstream ss;
ss << "path=" << hostInfo_.Path << "&"
<< "from=" << from << "&"
<< "to=" << to << "&"
<< "data=" << urlencodeData;
std::string postData = ss.str();
auto postData = stringFormat("path={}&from={}&to={}&data={}", hostInfo_.Path, from, to, urlencodeData);

// create the header
ss.str("");
std::stringstream ss;
ss << "Content-Length: " << postData.length() << "\n"
<< "Content-Type: application/x-www-form-urlencoded\n"
<< "\n"
Expand Down Expand Up @@ -1615,9 +1607,7 @@ void CurlIo::CurlImpl::getDataByRange(size_t lowBlock, size_t highBlock, std::st
// curl_easy_setopt(curl_, CURLOPT_VERBOSE, 1); // debugging mode

if (lowBlock != std::numeric_limits<size_t>::max() && highBlock != std::numeric_limits<size_t>::max()) {
std::stringstream ss;
ss << lowBlock * blockSize_ << "-" << ((highBlock + 1) * blockSize_ - 1);
std::string range = ss.str();
auto range = stringFormat("{}-{}", lowBlock * blockSize_, ((highBlock + 1) * blockSize_ - 1));
curl_easy_setopt(curl_, CURLOPT_RANGE, range.c_str());
}

Expand Down Expand Up @@ -1661,12 +1651,7 @@ void CurlIo::CurlImpl::writeRemote(const byte* data, size_t size, size_t from, s
base64encode(data, size, encodeData.data(), encodeLength);
// url encode
const std::string urlencodeData = urlencode(encodeData.data());
std::stringstream ss;
ss << "path=" << hostInfo.Path << "&"
<< "from=" << from << "&"
<< "to=" << to << "&"
<< "data=" << urlencodeData;
std::string postData = ss.str();
auto postData = stringFormat("path={}&from={}&to={}&data={}", hostInfo.Path, from, to, urlencodeData);

curl_easy_setopt(curl_, CURLOPT_POSTFIELDS, postData.c_str());
// Perform the request, res will get the return code.
Expand Down

0 comments on commit 5b14d75

Please sign in to comment.