1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

url: mark ignored return value in node::url::Parse(...)

Browse Source 
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>
This commit is contained in:
Christopher J. Brody 2016-11-23 11:53:13 +01:00 committed by James M Snell
parent 099762de61
commit 595b22affa
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/node_url.cc
View File

@ -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) {