lib/cpp-httplib
1
0
Fork 0
mirror of synced 2025-04-20 11:47:43 +03:00
Code

Changed output type of read_content_??? functions to be std::string&

Browse Source
This commit is contained in:
yhirose 2018-04-17 23:47:24 -04:00
parent b6df220b55
commit 956faae6f0
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
httplib.h
View File

@ -767,13 +767,12 @@ inline bool read_headers(Stream& strm, Headers& headers)
return true; return true;
} }
template <typename T> bool read_content_with_length(Stream& strm, std::string& out, size_t len, Progress progress)
bool read_content_with_length(Stream& strm, T& x, size_t len, Progress progress)
{ {
x.body.assign(len, 0); out.assign(len, 0);
size_t r = 0; size_t r = 0;
while (r < len){ while (r < len){
auto n = strm.read(&x.body[r], len - r); auto n = strm.read(&out[r], len - r);
if (n <= 0) { if (n <= 0) {
return false; return false;
} }
@ -788,8 +787,7 @@ bool read_content_with_length(Stream& strm, T& x, size_t len, Progress progress)
return true; return true;
} }
template <typename T> bool read_content_without_length(Stream& strm, std::string& out)
bool read_content_without_length(Stream& strm, T& x)
{ {
for (;;) { for (;;) {
char byte; char byte;
@ -799,14 +797,13 @@ bool read_content_without_length(Stream& strm, T& x)
} else if (n == 0) { } else if (n == 0) {
return true; return true;
} }
x.body += byte; out += byte;
} }
return true; return true;
} }
template <typename T> bool read_content_chunked(Stream& strm, std::string& out)
bool read_content_chunked(Stream& strm, T& x)
{ {
const auto bufsiz = 16; const auto bufsiz = 16;
char buf[bufsiz]; char buf[bufsiz];
@ -835,7 +832,7 @@ bool read_content_chunked(Stream& strm, T& x)
break; break;
} }
x.body += chunk; out += chunk;
if (!reader.getline()) { if (!reader.getline()) {
return false; return false;
@ -859,14 +856,14 @@ bool read_content(Stream& strm, T& x, Progress progress = Progress())
auto len = get_header_value_int(x.headers, "Content-Length", 0); auto len = get_header_value_int(x.headers, "Content-Length", 0);
if (len) { if (len) {
return read_content_with_length(strm, x, len, progress); return read_content_with_length(strm, x.body, len, progress);
} else { } else {
const auto& encoding = get_header_value(x.headers, "Transfer-Encoding", ""); const auto& encoding = get_header_value(x.headers, "Transfer-Encoding", "");
if (!strcasecmp(encoding, "chunked")) { if (!strcasecmp(encoding, "chunked")) {
return read_content_chunked(strm, x); return read_content_chunked(strm, x.body);
} else { } else {
return read_content_without_length(strm, x); return read_content_without_length(strm, x.body);
} }
} }