diff options
Diffstat (limited to '')
-rw-r--r-- | sca-cpp/trunk/components/filedb/filedb.cpp | 4 | ||||
-rw-r--r-- | sca-cpp/trunk/components/filedb/filedb.hpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sca-cpp/trunk/components/filedb/filedb.cpp b/sca-cpp/trunk/components/filedb/filedb.cpp index b28cc9bedb..efc5838fa6 100644 --- a/sca-cpp/trunk/components/filedb/filedb.cpp +++ b/sca-cpp/trunk/components/filedb/filedb.cpp @@ -68,7 +68,7 @@ const failable<value> put(const list<value>& params, const filedb::FileDB& db) { const failable<value> patch(const list<value>& params, const filedb::FileDB& db) { // Read patch value p = assoc<value>("patch", assoc<value>("content", car<value>(cadr(params)))); - if (isNil(p)) + if (isNull(p)) return mkfailure<value>("Couldn't read patch script"); const string script = cadr<value>(p); debug(script, "filedb::patch::script"); @@ -82,7 +82,7 @@ const failable<value> patch(const list<value>& params, const filedb::FileDB& db) // Apply patch scheme::Env env = scheme::setupEnvironment(); const value pval = scheme::evalScript(cons<value>("patch", scheme::quotedParameters(mklist<value>(car(params), hasContent(ival)? content(ival) : (value)list<value>()))), is, env); - if (isNil(pval)) { + if (isNull(pval)) { ostringstream os; os << "Couldn't patch file database entry: " << car(params); return mkfailure<value>(str(os), 404, false); diff --git a/sca-cpp/trunk/components/filedb/filedb.hpp b/sca-cpp/trunk/components/filedb/filedb.hpp index 41dde88bef..89e0c1b424 100644 --- a/sca-cpp/trunk/components/filedb/filedb.hpp +++ b/sca-cpp/trunk/components/filedb/filedb.hpp @@ -91,7 +91,7 @@ private: * Convert a key to a file name. */ const string filename(const list<value>& path, const string& root) { - if (isNil(path)) + if (isNull(path)) return root; const string name = root + "/" + (isString(car(path))? (string)car(path) : write(content(scheme::writeValue(car(path))))); return filename(cdr(path), name); @@ -107,7 +107,7 @@ const string filename(const value& key, const string& root) { * Make the parent directories of a keyed file. */ const failable<bool> mkdirs(const list<value>& path, const string& root) { - if (isNil(cdr(path))) + if (isNull(cdr(path))) return true; const string dir = root + "/" + (isString(car(path))? (string)car(path) : write(content(scheme::writeValue(car(path))))); mkdir(c_str(dir), S_IRWXU); |