diff options
| author | Robert Newson <robert.newson@cloudant.com> | 2011-10-31 18:36:54 +0000 |
|---|---|---|
| committer | Robert Newson <robert.newson@cloudant.com> | 2011-10-31 18:54:51 +0000 |
| commit | 8bbd833f866c8dfdaaf06f3dc5a5ca06030504e8 (patch) | |
| tree | c5da36c09f33c689a70d99480327140362031d8e /couchjs | |
| parent | a6352493651f6f8e3430269555421b5599a77809 (diff) | |
| parent | af7a6ae52890c6c158615068f2a48d40c52ec538 (diff) | |
Merge commit '1.1.1' into 0.4.x
Conflicts:
acinclude.m4.in
configure.ac
couchjs/c_src/http.c
src/erlang-oauth/Makefile.am
src/erlang-oauth/oauth.app.in
src/erlang-oauth/oauth_hmac_sha1.erl
src/erlang-oauth/oauth_http.erl
src/erlang-oauth/oauth_plaintext.erl
src/etap/etap_web.erl
Diffstat (limited to 'couchjs')
| -rw-r--r-- | couchjs/c_src/help.h | 2 | ||||
| -rw-r--r-- | couchjs/c_src/http.c | 12 | ||||
| -rw-r--r-- | couchjs/c_src/sm185.c | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/couchjs/c_src/help.h b/couchjs/c_src/help.h index 84c83c06..c42c9f59 100644 --- a/couchjs/c_src/help.h +++ b/couchjs/c_src/help.h @@ -51,7 +51,7 @@ static const char USAGE_TEMPLATE[] = " -H enable %s cURL bindings (only avaiable\n" " if package was built with cURL available)\n" " -S SIZE specify that the interpreter should set the\n" - " the stack quota for JS contexts to SIZE bytes\n" + " stack quota for JS contexts to SIZE bytes\n" "\n" "Report bugs at <%s>.\n"; diff --git a/couchjs/c_src/http.c b/couchjs/c_src/http.c index aa21515c..44df3a33 100644 --- a/couchjs/c_src/http.c +++ b/couchjs/c_src/http.c @@ -181,7 +181,7 @@ http_open(JSContext* cx, JSObject* req, jsval mth, jsval url, jsval snc) goto done; } - if(mth == JSVAL_VOID) { + if(JSVAL_IS_VOID(mth)) { JS_ReportError(cx, "You must specify a method."); goto done; } @@ -203,7 +203,7 @@ http_open(JSContext* cx, JSObject* req, jsval mth, jsval url, jsval snc) http->method = methid; - if(url == JSVAL_VOID) { + if(JSVAL_IS_VOID(url)) { JS_ReportError(cx, "You must specify a URL."); goto done; } @@ -219,7 +219,7 @@ http_open(JSContext* cx, JSObject* req, jsval mth, jsval url, jsval snc) goto done; } - if(snc != JSVAL_FALSE) { + if(JSVAL_IS_BOOLEAN(snc) && JSVAL_TO_BOOLEAN(snc)) { JS_ReportError(cx, "Synchronous flag must be false."); goto done; } @@ -255,7 +255,7 @@ http_set_hdr(JSContext* cx, JSObject* req, jsval name, jsval val) goto done; } - if(name == JSVAL_VOID) + if(JSVAL_IS_VOID(name)) { JS_ReportError(cx, "You must speciy a header name."); goto done; @@ -268,7 +268,7 @@ http_set_hdr(JSContext* cx, JSObject* req, jsval name, jsval val) goto done; } - if(val == JSVAL_VOID) + if(JSVAL_IS_VOID(val)) { JS_ReportError(cx, "You must specify a header value."); goto done; @@ -313,7 +313,7 @@ http_send(JSContext* cx, JSObject* req, jsval body) goto done; } - if(body != JSVAL_VOID && body != JS_GetEmptyStringValue(cx)) { + if(!JSVAL_IS_VOID(body)) { bodystr = enc_string(cx, body, &bodylen); if(!bodystr) { JS_ReportError(cx, "Failed to encode body."); diff --git a/couchjs/c_src/sm185.c b/couchjs/c_src/sm185.c index 9815f15c..a7258460 100644 --- a/couchjs/c_src/sm185.c +++ b/couchjs/c_src/sm185.c @@ -310,7 +310,7 @@ main(int argc, const char* argv[]) JSObject* global = NULL; JSCrossCompartmentCall *call = NULL; JSObject* klass = NULL; - JSObject* script; + JSSCRIPT_TYPE script; JSString* scriptsrc; const jschar* schars; size_t slen; |