diff options
| author | Christopher J. Brody <brodybits@litehelpers.net> | 2016-11-23 11:53:13 +0100 |
|---|---|---|
| committer | James M Snell <jasnell@gmail.com> | 2016-12-27 14:44:32 -0800 |
| commit | 595b22affad1c87574f7d266ecf4159b1d30da04 (patch) | |
| tree | d8717aa5ace136cd98e067396ff6c90b641a6fa0 /src/node_url.cc | |
| parent | 099762de614fc4cca094d9477398e6c96ffd982f (diff) | |
| download | android-node-v8-595b22affad1c87574f7d266ecf4159b1d30da04.tar.gz android-node-v8-595b22affad1c87574f7d266ecf4159b1d30da04.tar.bz2 android-node-v8-595b22affad1c87574f7d266ecf4159b1d30da04.zip | |
url: mark ignored return value in node::url::Parse(...)
This is to resolve an unused result warning in node_url.cc.
Resolve macro redefinition warning on Windows
PR-URL: https://github.com/nodejs/node/pull/10141
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Sam Roberts <vieuxtech@gmail.com>
Diffstat (limited to 'src/node_url.cc')
| -rw-r--r-- | src/node_url.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/node_url.cc b/src/node_url.cc index 7502461114..9bf58944d6 100644 --- a/src/node_url.cc +++ b/src/node_url.cc @@ -62,7 +62,7 @@ using v8::Value; url.flags |= URL_FLAGS_TERMINATED; \ goto done; \ } -#define FAILED() \ +#define URL_FAILED() \ { \ url.flags |= URL_FLAGS_FAILED; \ goto done; \ @@ -744,7 +744,7 @@ namespace url { break; case kNoScheme: if (!has_base || (IS_CANNOT_BE_BASE(base.flags) && ch != '#')) { - FAILED() + URL_FAILED() } else if (IS_CANNOT_BE_BASE(base.flags) && ch == '#') { SET_HAVE_SCHEME() url.scheme = base.scheme; @@ -982,10 +982,10 @@ namespace url { case kHostname: if (ch == ':' && !sbflag) { if (special && buffer.size() == 0) - FAILED() + URL_FAILED() SET_HAVE_HOST() if (ParseHost(&buffer, &url.host) < 0) - FAILED() + URL_FAILED() buffer.clear(); state = kPort; if (override == kHostname) @@ -997,10 +997,10 @@ namespace url { special_back_slash) { p--; if (special && buffer.size() == 0) - FAILED() + URL_FAILED() SET_HAVE_HOST() if (ParseHost(&buffer, &url.host) < 0) - FAILED() + URL_FAILED() buffer.clear(); state = kPathStart; if (state_override) @@ -1029,14 +1029,14 @@ namespace url { if (port >= 0 && port <= 0xffff) { url.port = NormalizePort(url.scheme, port); } else if (!state_override) { - FAILED() + URL_FAILED() } buffer.clear(); } state = kPathStart; continue; } else { - FAILED(); + URL_FAILED(); } break; case kFile: @@ -1151,7 +1151,7 @@ namespace url { if (buffer != "localhost") { SET_HAVE_HOST() if (ParseHost(&buffer, &url.host) < 0) - FAILED() + URL_FAILED() } buffer.clear(); state = kPathStart; @@ -1294,7 +1294,7 @@ namespace url { argv[ARG_PATH] = Copy(isolate, url.path); } - cb->Call(context, recv, 9, argv); + (void)cb->Call(context, recv, 9, argv); } static void Parse(const FunctionCallbackInfo<Value>& args) { |