mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-06-28 02:11:43 +00:00
Change API of raw_istream to be more similar to raw_ostream.
This commit is contained in:
@@ -103,7 +103,8 @@ bool ReadUleb128(raw_istream& is, unsigned long* ret) {
|
||||
|
||||
while (1) {
|
||||
unsigned char byte;
|
||||
if (!is.read((char*)&byte, 1)) return false;
|
||||
is.read((char*)&byte, 1);
|
||||
if (is.has_error()) return false;
|
||||
|
||||
result |= (byte & 0x7f) << shift;
|
||||
shift += 7;
|
||||
|
||||
@@ -11,10 +11,14 @@
|
||||
|
||||
using namespace wpi;
|
||||
|
||||
bool raw_mem_istream::read(void* data, std::size_t len) {
|
||||
if (len > m_left) return false;
|
||||
void raw_mem_istream::close() {}
|
||||
|
||||
void raw_mem_istream::read_impl(void* data, std::size_t len) {
|
||||
if (len > m_left) {
|
||||
error_detected();
|
||||
return;
|
||||
}
|
||||
std::memcpy(data, m_cur, len);
|
||||
m_cur += len;
|
||||
m_left -= len;
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -6,10 +6,11 @@
|
||||
/*----------------------------------------------------------------------------*/
|
||||
|
||||
#include "support/raw_socket_istream.h"
|
||||
#include "tcpsockets/NetworkStream.h"
|
||||
|
||||
using namespace wpi;
|
||||
|
||||
bool raw_socket_istream::read(void* data, std::size_t len) {
|
||||
void raw_socket_istream::read_impl(void* data, std::size_t len) {
|
||||
char* cdata = static_cast<char*>(data);
|
||||
std::size_t pos = 0;
|
||||
|
||||
@@ -17,10 +18,12 @@ bool raw_socket_istream::read(void* data, std::size_t len) {
|
||||
NetworkStream::Error err;
|
||||
std::size_t count =
|
||||
m_stream.receive(&cdata[pos], len - pos, &err, m_timeout);
|
||||
if (count == 0) return false;
|
||||
if (count == 0) {
|
||||
error_detected();
|
||||
return;
|
||||
}
|
||||
pos += count;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
void raw_socket_istream::close() { m_stream.close(); }
|
||||
|
||||
Reference in New Issue
Block a user