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

Fixed MemFs constructor to try to init without an Error pointer passed in.

Browse Source
This commit is contained in:
Gary Talent
2015-09-07 03:30:31 -05:00
parent 54d64aa0ab
commit c0c5c72e32
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/memphis/memfs.cpp
+10 -8
View File
@@ -38,18 +38,20 @@ void MemFs::Record::setData(uint8_t *data, int size) {
// MemFs // MemFs
MemFs::MemFs(uint8_t *begin, uint8_t *end, Error *error): m_version(*((uint32_t*) begin)), m_lastRec(*(MemFsPtr*) (begin + sizeof(m_version))) { MemFs::MemFs(uint8_t *begin, uint8_t *end, Error *error): m_version(*((uint32_t*) begin)), m_lastRec(*(MemFsPtr*) (begin + sizeof(m_version))) {
if (error) { if (version != m_version) {
if (version != m_version) { // version mismatch
// version mismatch if (error) {
*error = 1; *error = 1;
} else { }
// ok } else {
// ok
m_begin = begin;
m_end = end;
m_root = (Record*) (begin + sizeof(MemFsPtr));
if (error) {
*error = 0; *error = 0;
} }
} }
m_begin = begin;
m_end = end;
m_root = (Record*) (begin + sizeof(MemFsPtr));
} }
void MemFs::init() { void MemFs::init() {