summaryrefslogtreecommitdiffstats
path: root/sca-cpp/trunk/modules/http/httpd.hpp
diff options
context:
space:
mode:
authorjsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>2013-01-03 08:10:25 +0000
committerjsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>2013-01-03 08:10:25 +0000
commit2853156a2bce535bcaa440c37cf872916f76c03b (patch)
tree8e161033a9bac8274dcaca05940964b91cdb2bfc /sca-cpp/trunk/modules/http/httpd.hpp
parent55607ea78e10832838d52fdb17cbdfe4355c3265 (diff)
Refactoring, rename isNil to isNull.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1428206 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-cpp/trunk/modules/http/httpd.hpp')
-rw-r--r--sca-cpp/trunk/modules/http/httpd.hpp8
1 files changed, 4 insertions, 4 deletions
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)));