From a5166e03bbaea2f200cfc730c69579c3d50ae2a7 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Thu, 4 May 2017 00:50:53 -0500 Subject: [PATCH] Fix oxfstool format to use FileSystem::format instead of FileStore::format --- src/ox/fs/oxfstool.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/ox/fs/oxfstool.cpp b/src/ox/fs/oxfstool.cpp index d7a84da1d..6fc9e5b6a 100644 --- a/src/ox/fs/oxfstool.cpp +++ b/src/ox/fs/oxfstool.cpp @@ -20,7 +20,7 @@ using namespace ox::fs; using namespace std; -const static auto oxfstoolVersion = "1.2.0"; +const static auto oxfstoolVersion = "1.3.0"; const static auto usage = "usage:\n" "\toxfs format [16,32,64] \n" "\toxfs read \n" @@ -99,13 +99,13 @@ int format(int argc, char **args) { // format switch (type) { case 16: - FileStore16::format(buff, (FileStore16::FsSize_t) size, true); + FileSystem16::format(buff, (FileStore16::FsSize_t) size, true); break; case 32: - FileStore32::format(buff, (FileStore32::FsSize_t) size, true); + FileSystem32::format(buff, (FileStore32::FsSize_t) size, true); break; case 64: - FileStore64::format(buff, size, true); + FileSystem64::format(buff, size, true); break; default: err = 1; @@ -128,7 +128,9 @@ int format(int argc, char **args) { delete []buff; if (err == 0) { - fprintf(stderr, "Created file system %s\n", path); + cerr << "Created file system of type " << type << " " << path << endl; + cerr << "\ttype " << type << endl; + cerr << "\twrote " << size << " bytes\n"; } } else { fprintf(stderr, "Insufficient arguments\n");