Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-27 07:20:49 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Cut down on CHECK() and FLOG() in Buffer.

Browse Source 
Also add a buffer copy (would rather not read into the wrong buffer to start, but it happens...)
This commit is contained in:
Unknown W. Brackets 2013-06-24 19:36:53 -07:00
parent 80c85b1c60
commit ec66427904
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
base/buffer.cpp
View File

@ -36,6 +36,12 @@ void Buffer::Append(const char *str) {
memcpy(dest, str, len);
}
void Buffer::Append(const Buffer &other) {
size_t len = other.size();
char *dest = Append(len);
memcpy(dest, &other.data_[0], len);
}
void Buffer::AppendValue(int value) {
char buf[16];
// This is slow.
@ -44,8 +50,11 @@ void Buffer::AppendValue(int value) {
}
void Buffer::Take(size_t length, std::string *dest) {
CHECK_LE(length, data_.size());
dest->resize(length);
if (length > data_.size()) {
ELOG("Truncating length in Buffer::Take()");
length = data_.size();
}
dest->resize(length);
if (length > 0) {
memcpy(&(*dest)[0], &data_[0], length);
data_.erase(data_.begin(), data_.begin() + length);
@ -64,7 +73,11 @@ int Buffer::TakeLineCRLF(std::string *dest) {
}
void Buffer::Skip(size_t length) {
data_.erase(data_.begin(), data_.begin() + length);
if (length > data_.size()) {
ELOG("Truncating length in Buffer::Skip()");
length = data_.size();
}
data_.erase(data_.begin(), data_.begin() + length);
}
int Buffer::SkipLineCRLF() {
@ -87,18 +100,19 @@ int Buffer::OffsetToAfterNextCRLF() {
}
void Buffer::Printf(const char *fmt, ...) {
char buffer[512];
char buffer[2048];
va_list vl;
va_start(vl, fmt);
ssize_t retval = vsnprintf(buffer, sizeof(buffer), fmt, vl);
if (retval >= (ssize_t)sizeof(buffer)) {
// Output was truncated. TODO: Do something.
FLOG("Buffer::Printf truncated output");
ELOG("Buffer::Printf truncated output");
}
if (retval < 0) {
ELOG("Buffer::Printf failed");
}
CHECK_GE(retval, 0);
va_end(vl);
char *ptr = Append(retval);
CHECK(ptr);
memcpy(ptr, buffer, retval);
}

5
base/buffer.h
View File

@ -19,9 +19,10 @@ class Buffer {
char *Append(ssize_t length);
char *Append(size_t length) { return Append((ssize_t)length); }
// These work pretty much like you'd expect.
// These work pretty much like you'd expect.
void Append(const char *str); // str null-terminated. The null is not copied.
void Append(const std::string &str);
void Append(const std::string &str);
void Append(const Buffer &other);
// Various types. Useful for varz etc. Appends a string representation of the
// value, rather than a binary representation.