Refactoring, rename isNil to isNull.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1428206 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 28 insertions, 28 deletions

diff --git a/sca-cpp/trunk/modules/http/http.hpp b/sca-cpp/trunk/modules/http/http.hpp
index cd0eb6c04b..04b0d4e490 100644
--- a/sca-cpp/trunk/modules/http/http.hpp
+++ b/sca-cpp/trunk/modules/http/http.hpp
@@ -367,7 +367,7 @@ public:
  */
 size_t readCallback(void *ptr, size_t size, size_t nmemb, void *data) {
     CURLReadContext& rcx = *(CURLReadContext*)data;
-    if (isNil((const list<string>)rcx.ilist))
+    if (isNull((const list<string>)rcx.ilist))
         return 0;
     const list<string> f(fragment(rcx.ilist, size * nmemb));
     const string s = car(f);
@@ -403,7 +403,7 @@ template<typename R> size_t writeCallback(void *ptr, size_t size, size_t nmemb,
  * a reduce function used to process the response.
  */
 curl_slist* headers(curl_slist* const cl, const list<string>& h) {
-    if (isNil(h))
+    if (isNull(h))
         return cl;
     return headers(curl_slist_append(cl, c_str(string(car(h)))), cdr(h));
 }
@@ -508,7 +508,7 @@ const failable<value> evalExpr(const value& expr, const string& url, const CURLS
  * Find and return a header.
  */
 const maybe<string> header(const char* const prefix, const list<string>& h) {
-    if (isNil(h))
+    if (isNull(h))
         return maybe<string>();
     const string s = car(h);
     if (find(s, prefix) != 0)
@@ -676,7 +676,7 @@ const failable<list<list<string> > > contentRequest(const value& c, unused const
 
     // Write in the format requested by the client, if any
     const list<value> fmt = assoc<value>("format", nilListValue);
-    if (!isNil(fmt)) {
+    if (!isNull(fmt)) {
         if (cadr(fmt) == "scheme")
             return writeRequest(scheme::writeValue(c), "text/x-scheme; charset=utf-8");
         if (cadr(fmt) == "json")
@@ -692,26 +692,26 @@ const failable<list<list<string> > > contentRequest(const value& c, unused const
     }
 
     // Write an empty list as a JSON value
-    if (isNil((list<value>)c)) {
+    if (isNull((list<value>)c)) {
         debug(nilListValue, "http::contentRequest::empty");
         return writeRequest(json::writeValue(c), "application/json; charset=utf-8");
     }
 
     // Write content-type / content-list pair
-    if (isString(car<value>(c)) && !isNil(cdr<value>(c)) && isList(cadr<value>(c)))
+    if (isString(car<value>(c)) && !isNull(cdr<value>(c)) && isList(cadr<value>(c)))
         return writeRequest(convertValues<string>(cadr<value>(c)), car<value>(c));
 
     // Write an assoc value as a JSON value
-    if (isSymbol(car<value>(c)) && !isNil(cdr<value>(c))) {
+    if (isSymbol(car<value>(c)) && !isNull(cdr<value>(c))) {
         debug(c, "http::contentRequest::assoc");
         return writeRequest(json::writeValue(c), "application/json; charset=utf-8");
     }
 
     // Write an ATOM feed or entry
     const list<value> e = valuesToElements(c);
-    if (isList(car<value>(e)) && !isNil(car<value>(e))) {
+    if (isList(car<value>(e)) && !isNull(car<value>(e))) {
         const list<value> el = car<value>(e);
-        if (isSymbol(car<value>(el)) && car<value>(el) == element && !isNil(cdr<value>(el)) && isSymbol(cadr<value>(el)) && elementHasChildren(el) && !elementHasValue(el)) {
+        if (isSymbol(car<value>(el)) && car<value>(el) == element && !isNull(cdr<value>(el)) && isSymbol(cadr<value>(el)) && elementHasChildren(el) && !elementHasValue(el)) {
             if (cadr<value>(el) == atom::feed)
                 return writeRequest(atom::writeATOMFeed(e), "application/atom+xml; charset=utf-8");
             if (cadr<value>(el) == atom::entry)
@@ -943,14 +943,14 @@ const failable<size_t> recv(char* const c, const size_t l, const CURLSession& cs
  * Converts a list of key value pairs to a query string.
  */
 ostringstream& queryString(const list<value>& args, ostringstream& os) {
-    if (isNil(args))
+    if (isNull(args))
         return os;
     const list<value> arg = car(args);
     debug(arg, "http::queryString::arg");
-    if (isNil(arg) || isNil(cdr(arg)))
+    if (isNull(arg) || isNull(cdr(arg)))
         return queryString(cdr(args), os);
     os << car(arg) << "=" << c_str(cadr(arg));
-    if (!isNil(cdr(args)))
+    if (!isNull(cdr(args)))
         os << "&";
     return queryString(cdr(args), os);
 }
diff --git a/sca-cpp/trunk/modules/http/httpd.hpp b/sca-cpp/trunk/modules/http/httpd.hpp
index 255f0aa31b..bf06ed5d91 100644
--- a/sca-cpp/trunk/modules/http/httpd.hpp
+++ b/sca-cpp/trunk/modules/http/httpd.hpp
@@ -260,7 +260,7 @@ const string cookie(const request_rec* const r) {
  * Return the remaining part of a uri after the given path (aka the path info.)
  */
 const list<value> pathInfo(const list<value>& uri, const list<value>& path) {
-    if (isNil(path))
+    if (isNull(path))
         return uri;
     return pathInfo(cdr(uri), cdr(path));
 }
@@ -347,14 +347,14 @@ const list<value> unescapeArgs(const list<value>& args) {
 const value queryArg(const string& s) {
     debug(s, "httpd::queryArg::string");
     const list<string> t = tokenize("=", s);
-    if (isNil(cdr(t)))
+    if (isNull(cdr(t)))
         return mklist<value>(c_str(car(t)), emptyString);
     return mklist<value>(c_str(car(t)), cadr(t));
 }
 
 const string fixupQueryArgs(const string& a) {
     const list<string> t = tokenize("?", a);
-    if (isNil(t) || isNil(cdr(t)))
+    if (isNull(t) || isNull(cdr(t)))
         return a;
     return join("&", t);
 }
@@ -376,7 +376,7 @@ const list<value> queryArgs(const request_rec* const r) {
  * Converts the args received in a POST to a list of key value pairs.
  */
 const list<value> postArgs(const list<value>& a) {
-    if (isNil(a))
+    if (isNull(a))
         return nilListValue;
     const list<value> l = car(a);
     return cons<value>(l, postArgs(cdr(a)));
diff --git a/sca-cpp/trunk/modules/http/mod-openauth.cpp b/sca-cpp/trunk/modules/http/mod-openauth.cpp
index 1b70f27744..3adc488301 100644
--- a/sca-cpp/trunk/modules/http/mod-openauth.cpp
+++ b/sca-cpp/trunk/modules/http/mod-openauth.cpp
@@ -127,7 +127,7 @@ static apr_status_t (*ap_session_set_fn)(request_rec * r, session_rec * z, const
  * Run the authnz hooks to authenticate a request.
  */
 const failable<int> checkAuthnzProviders(const string& user, const string& pw, request_rec* const r, const list<AuthnProviderConf>& apcs) {
-    if(isNil(apcs))
+    if(isNull(apcs))
         return mkfailure<int>("Authentication failure for: " + user, HTTP_UNAUTHORIZED);
     const AuthnProviderConf apc = car<AuthnProviderConf>(apcs);
     if(apc.provider == NULL || !apc.provider->check_password)
@@ -145,7 +145,7 @@ const failable<int> checkAuthnz(const string& user, const string& pw, request_re
     if(substr(user, 0, 1) == "/" && pw == "password")
         return mkfailure<int>(string("Encountered FakeBasicAuth spoof: ") + user, HTTP_UNAUTHORIZED);
 
-    if(isNil((const list<AuthnProviderConf>)dc.apcs)) {
+    if(isNull((const list<AuthnProviderConf>)dc.apcs)) {
         const authn_provider* provider = (const authn_provider*)ap_lookup_provider(AUTHN_PROVIDER_GROUP, AUTHN_DEFAULT_PROVIDER, AUTHN_PROVIDER_VERSION);
         return checkAuthnzProviders(user, pw, r, mklist<AuthnProviderConf>(AuthnProviderConf(AUTHN_DEFAULT_PROVIDER, provider)));
     }
@@ -181,10 +181,10 @@ const failable<value> userInfoFromCookie(const value& sid, const string& realm,
     const list<value> info = httpd::queryArgs(sid);
     debug(info, "modopenauth::userInfoFromCookie::info");
     const list<value> user = assoc<value>(realm + "-user", info);
-    if(isNil(user))
+    if(isNull(user))
         return userInfoFromSession(realm, r);
     const list<value> pw = assoc<value>(realm + "-pw", info);
-    if(isNil(pw))
+    if(isNull(pw))
         return mkfailure<value>("Couldn't retrieve password", HTTP_UNAUTHORIZED);
     return value(mklist<value>(mklist<value>("realm", realm), mklist<value>("id", cadr(user)), mklist<value>("password", cadr(pw))));
 }
@@ -217,12 +217,12 @@ const failable<int> authenticated(const list<value>& info, request_rec* const r)
 
     // Store user info in the request
     const list<value> realm = assoc<value>("realm", info);
-    if(isNil(realm) || isNil(cdr(realm)))
+    if(isNull(realm) || isNull(cdr(realm)))
         return mkfailure<int>("Couldn't retrieve realm", HTTP_UNAUTHORIZED);
     apr_table_set(r->subprocess_env, apr_pstrdup(r->pool, "REALM"), apr_pstrdup(r->pool, c_str(cadr(realm))));
 
     const list<value> id = assoc<value>("id", info);
-    if(isNil(id) || isNil(cdr(id)))
+    if(isNull(id) || isNull(cdr(id)))
         return mkfailure<int>("Couldn't retrieve user id", HTTP_UNAUTHORIZED);
     r->user = apr_pstrdup(r->pool, c_str(cadr(id)));
 
@@ -313,7 +313,7 @@ static int checkAuthn(request_rec* const r) {
     }
 
     // Decline if the request is for another authentication provider
-    if(!isNil(assoc<value>("openid_identifier", args)))
+    if(!isNull(assoc<value>("openid_identifier", args)))
         return DECLINED;
 
     // Redirect to the login page, unless we have a session id from another module
diff --git a/sca-cpp/trunk/modules/http/openauth.hpp b/sca-cpp/trunk/modules/http/openauth.hpp
index 1c49c4254c..70c6f658ad 100644
--- a/sca-cpp/trunk/modules/http/openauth.hpp
+++ b/sca-cpp/trunk/modules/http/openauth.hpp
@@ -49,13 +49,13 @@ const char* const cookieName(const char* const cs) {
 }
 
 const maybe<string> sessionID(const list<string>& c, const string& key) {
-    if (isNil(c))
+    if (isNull(c))
         return maybe<string>();
     const string cn = cookieName(c_str(car(c)));
     const size_t i = find(cn, "=");
     if (i < length(cn)) {
         const list<string> kv = mklist<string>(substr(cn, 0, i), substr(cn, i+1));
-        if (!isNil(kv) && !isNil(cdr(kv))) {
+        if (!isNull(kv) && !isNull(cdr(kv))) {
             if (car(kv) == key)
                 return cadr(kv);
         }
@@ -92,10 +92,10 @@ const string cookie(const string& key, const string& sid, const string& domain)
  * Redirect to the configured login page.
  */
 const failable<int> login(const string& page, const value& ref, const value& attempt, request_rec* const r) {
-    const list<value> rarg = ref == string("/")? nilListValue : mklist<value>(mklist<value>("openauth_referrer", httpd::escape(httpd::url(isNil(ref)? r->uri : ref, r))));
-    const list<value> aarg = isNil(attempt)? nilListValue : mklist<value>(mklist<value>("openauth_attempt", attempt));
+    const list<value> rarg = ref == string("/")? nilListValue : mklist<value>(mklist<value>("openauth_referrer", httpd::escape(httpd::url(isNull(ref)? r->uri : ref, r))));
+    const list<value> aarg = isNull(attempt)? nilListValue : mklist<value>(mklist<value>("openauth_attempt", attempt));
     const list<value> largs = append(rarg, aarg);
-    const string loc = isNil(largs)? httpd::url(page, r) : httpd::url(page, r) + string("?") + http::queryString(largs);
+    const string loc = isNull(largs)? httpd::url(page, r) : httpd::url(page, r) + string("?") + http::queryString(largs);
     debug(loc, "openauth::login::uri");
     return httpd::externalRedirect(loc, r);
 }