Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-22 01:11:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move ReadLine into raw_istream class as getline. (#20)

Browse Source
This commit is contained in:
Peter Johnson
2017-08-13 00:56:35 -07:00
committed by GitHub
parent 17b5cace5b
commit 7d9e6b7e22
4 changed files with 35 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/native/cpp/support/HttpUtil.cpp
View File

@@ -17,24 +17,6 @@
namespace wpi {
llvm::StringRef ReadLine(raw_istream& is, llvm::SmallVectorImpl<char>& buf,
int maxLen, bool* error) {
buf.clear();
for (int i = 0; i < maxLen; ++i) {
char c;
is.read(c);
if (is.has_error()) {
*error = true;
return llvm::StringRef{buf.data(), buf.size()};
}
if (c == '\r') continue;
buf.push_back(c);
if (c == '\n') break;
}
*error = false;
return llvm::StringRef{buf.data(), buf.size()};
}
llvm::StringRef UnescapeURI(llvm::StringRef str,
llvm::SmallVectorImpl<char>& buf, bool* error) {
buf.clear();
@@ -109,9 +91,8 @@ bool ParseHttpHeaders(raw_istream& is, llvm::SmallVectorImpl<char>* contentType,
bool inContentLength = false;
llvm::SmallString<64> lineBuf;
for (;;) {
bool error;
llvm::StringRef line = ReadLine(is, lineBuf, 1024, &error).rtrim();
if (error) return false;
llvm::StringRef line = is.getline(lineBuf, 1024).rtrim();
if (is.has_error()) return false;
if (line.empty()) return true; // empty line signals end of headers
// header fields start at the beginning of the line
@@ -319,10 +300,9 @@ bool HttpConnection::Handshake(const HttpRequest& request,
os.flush();
// read first line of response
bool error = false;
llvm::SmallString<64> lineBuf;
llvm::StringRef line = ReadLine(is, lineBuf, 1024, &error).rtrim();
if (error) {
llvm::StringRef line = is.getline(lineBuf, 1024).rtrim();
if (is.has_error()) {
*warnMsg = "disconnected before response";
return false;
}

17
src/main/native/cpp/support/raw_istream.cpp
View File

@@ -16,8 +16,25 @@
#include <unistd.h>
#endif
#include "llvm/SmallVector.h"
#include "llvm/StringRef.h"
using namespace wpi;
llvm::StringRef raw_istream::getline(llvm::SmallVectorImpl<char>& buf,
int maxLen) {
buf.clear();
for (int i = 0; i < maxLen; ++i) {
char c;
read(c);
if (has_error()) return llvm::StringRef{buf.data(), buf.size()};
if (c == '\r') continue;
buf.push_back(c);
if (c == '\n') break;
}
return llvm::StringRef{buf.data(), buf.size()};
}
void raw_mem_istream::close() {}
std::size_t raw_mem_istream::in_avail() const { return m_left; }