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

Flattened FileStore.

Browse Source
This commit is contained in:
Gary Talent
2016-06-29 23:59:09 -05:00
parent a82f601b7c
commit f9d9a50e83
4 changed files with 45 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ox/fs/test/filestore_format.cpp
+1 -2
View File
@@ -12,8 +12,7 @@ using namespace ox::fs;
int main() {
const auto size = 65535;
uint8_t volume[size];
uint32_t err;
uint32_t err = 0;
FileStore32::format(volume, size);
FileStore32(volume, volume + size, &err);
return err;
}
src/ox/fs/test/filestoreio.cpp
+7 -8
View File
@@ -16,25 +16,24 @@ int test() {
const uint16_t size = ~0;
uint8_t volume[size];
char out[6];
uint32_t err;
typename FileStore::FsSize_t outSize;
FileStore::format(volume, size);
FileStore fs(volume, volume + size, &err);
FileStore *fs = (FileStore*) volume;
if (fs.write(1, (void*) "Hello", 6) ||
fs.read(1, (char*) out, &outSize) ||
if (fs->write(1, (void*) "Hello", 6) ||
fs->read(1, (char*) out, &outSize) ||
strcmp("Hello", out)) {
return 1;
}
if (fs.write(2, (void*) "World", 6) ||
fs.read(2, (char*) out, &outSize) ||
if (fs->write(2, (void*) "World", 6) ||
fs->read(2, (char*) out, &outSize) ||
strcmp("World", out)) {
return 1;
}
// make sure first value was not overwritten
if (fs.read(1, (char*) out, &outSize) ||
if (fs->read(1, (char*) out, &outSize) ||
strcmp("Hello", out)) {
return 1;
}
@@ -43,5 +42,5 @@ int test() {
}
int main() {
return test<FileStore16>() | test<FileStore32>() | test<FileStore64>();
return test<FileStore16>() || test<FileStore32>() | test<FileStore64>();
}