drinkingtea/ox
2
0
Fork 0
Code Issues Pull Requests Actions Releases Wiki Activity

Fix default values for MC reader and add 8+ fields struct to MC test

Browse Source
This commit is contained in:
Gary Talent
2017-04-30 22:00:54 -05:00
parent c3388c58f9
commit 746dae0ec5
2 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ox/mc/read.hpp
+7 -2
View File
@@ -60,6 +60,7 @@ int MetalClawReader::op(const char*, T *val) {
MetalClawReader reader(m_buff + m_buffIt, m_buffLen - m_buffIt); MetalClawReader reader(m_buff + m_buffIt, m_buffLen - m_buffIt);
err |= ioOp(&reader, val); err |= ioOp(&reader, val);
m_buffIt += reader.m_buffIt; m_buffIt += reader.m_buffIt;
m_field++;
return err; return err;
}; };
@@ -88,6 +89,8 @@ int MetalClawReader::op(const char*, ox::bstring<L> *val) {
} else { } else {
err |= MC_OUTBUFFENDED; err |= MC_OUTBUFFENDED;
} }
} else {
*val = "";
} }
m_field++; m_field++;
return err; return err;
@@ -103,6 +106,8 @@ int MetalClawReader::readInteger(I *val) {
} else { } else {
err = MC_BUFFENDED; err = MC_BUFFENDED;
} }
} else {
*val = 0;
} }
m_field++; m_field++;
return err; return err;
@@ -140,8 +145,8 @@ int MetalClawReader::op(const char*, T *val, size_t valLen) {
template<typename T> template<typename T>
int read(uint8_t *buff, size_t buffLen, T *val) { int read(uint8_t *buff, size_t buffLen, T *val) {
MetalClawReader writer(buff, buffLen); MetalClawReader reader(buff, buffLen);
return ioOp(&writer, val); return ioOp(&reader, val);
} }
} }
src/ox/mc/test/tests.cpp
+17 -1
View File
@@ -26,6 +26,14 @@ struct TestStructNest {
struct TestStruct { struct TestStruct {
bool Bool = false; bool Bool = false;
int32_t Int = 0; int32_t Int = 0;
int32_t Int1 = 0;
int32_t Int2 = 0;
int32_t Int3 = 0;
int32_t Int4 = 0;
int32_t Int5 = 0;
int32_t Int6 = 0;
int32_t Int7 = 0;
int32_t Int8 = 0;
bstring<32> String = ""; bstring<32> String = "";
uint32_t List[4] = {0, 0, 0 , 0}; uint32_t List[4] = {0, 0, 0 , 0};
TestStructNest Struct; TestStructNest Struct;
@@ -44,9 +52,17 @@ int ioOp(T *io, TestStructNest *obj) {
template<typename T> template<typename T>
int ioOp(T *io, TestStruct *obj) { int ioOp(T *io, TestStruct *obj) {
int err = 0; int err = 0;
io->setFields(4); io->setFields(13);
err |= io->op("Bool", &obj->Bool); err |= io->op("Bool", &obj->Bool);
err |= io->op("Int", &obj->Int); err |= io->op("Int", &obj->Int);
err |= io->op("Int1", &obj->Int1);
err |= io->op("Int2", &obj->Int2);
err |= io->op("Int3", &obj->Int3);
err |= io->op("Int4", &obj->Int4);
err |= io->op("Int5", &obj->Int5);
err |= io->op("Int6", &obj->Int6);
err |= io->op("Int7", &obj->Int7);
err |= io->op("Int8", &obj->Int8);
err |= io->op("String", &obj->String); err |= io->op("String", &obj->String);
err |= io->op("List", obj->List, 4); err |= io->op("List", obj->List, 4);
err |= io->op("Struct", &obj->Struct); err |= io->op("Struct", &obj->Struct);