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

Fix to build with GCC

Browse Source
This commit is contained in:
Gary Talent
2017-04-22 01:40:38 -05:00
parent 5936a751d3
commit a3fac6529b
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ox/fs/test/tests.cpp
+13 -9
View File
@@ -6,6 +6,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. * file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/ */
#include <assert.h>
#include <map> #include <map>
#include <string> #include <string>
#include <ox/fs/filesystem.hpp> #include <ox/fs/filesystem.hpp>
@@ -24,11 +25,12 @@ map<string, int(*)(string)> tests = {
int retval = 0; int retval = 0;
string path = "/usr/share/charset.gbag"; string path = "/usr/share/charset.gbag";
PathIterator it(path.c_str(), path.size()); PathIterator it(path.c_str(), path.size());
const auto buffSize = path.size() + 1; const auto buffSize = 1024;
char buff[buffSize]; char buff[buffSize];
retval |= !(it.next(buff, buffSize) == 0 && ox_strcmp(buff, "usr") == 0); assert(buffSize >= path.size());
retval |= !(it.next(buff, buffSize) == 0 && ox_strcmp(buff, "share") == 0); retval |= !(it.next(buff, path.size()) == 0 && ox_strcmp(buff, "usr") == 0);
retval |= !(it.next(buff, buffSize) == 0 && ox_strcmp(buff, "charset.gbag") == 0); retval |= !(it.next(buff, path.size()) == 0 && ox_strcmp(buff, "share") == 0);
retval |= !(it.next(buff, path.size()) == 0 && ox_strcmp(buff, "charset.gbag") == 0);
return retval; return retval;
} }
}, },
@@ -38,10 +40,11 @@ map<string, int(*)(string)> tests = {
int retval = 0; int retval = 0;
string path = "/usr/share/"; string path = "/usr/share/";
PathIterator it(path.c_str(), path.size()); PathIterator it(path.c_str(), path.size());
const auto buffSize = path.size() + 1; const auto buffSize = 1024;
char buff[buffSize]; char buff[buffSize];
retval |= !(it.next(buff, buffSize) == 0 && ox_strcmp(buff, "usr") == 0); assert(buffSize >= path.size());
retval |= !(it.next(buff, buffSize) == 0 && ox_strcmp(buff, "share") == 0); retval |= !(it.next(buff, path.size()) == 0 && ox_strcmp(buff, "usr") == 0);
retval |= !(it.next(buff, path.size()) == 0 && ox_strcmp(buff, "share") == 0);
return retval; return retval;
} }
}, },
@@ -51,9 +54,10 @@ map<string, int(*)(string)> tests = {
int retval = 0; int retval = 0;
string path = "/"; string path = "/";
PathIterator it(path.c_str(), path.size()); PathIterator it(path.c_str(), path.size());
const auto buffSize = path.size() + 1; const auto buffSize = 1024;
char buff[buffSize]; char buff[buffSize];
retval |= !(it.next(buff, buffSize) == 0 && ox_strcmp(buff, "\0") == 0); assert(buffSize >= path.size());
retval |= !(it.next(buff, path.size()) == 0 && ox_strcmp(buff, "\0") == 0);
return retval; return retval;
} }
}, },