Skip to content

Commit 9695066

Browse files
author
Christopher J. Brody
committed
url: use URL_FAILED instead of FAILED macro
Resolve macro redefinition warning on Windows
1 parent 5906faa commit 9695066

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

src/node_url.cc

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ using v8::Value;
6262
url.flags |= URL_FLAGS_TERMINATED; \
6363
goto done; \
6464
}
65-
#define FAILED() \
65+
#define URL_FAILED() \
6666
{ \
6767
url.flags |= URL_FLAGS_FAILED; \
6868
goto done; \
@@ -744,7 +744,7 @@ namespace url {
744744
break;
745745
case kNoScheme:
746746
if (!has_base || (IS_CANNOT_BE_BASE(base.flags) && ch != '#')) {
747-
FAILED()
747+
URL_FAILED()
748748
} else if (IS_CANNOT_BE_BASE(base.flags) && ch == '#') {
749749
SET_HAVE_SCHEME()
750750
url.scheme = base.scheme;
@@ -982,10 +982,10 @@ namespace url {
982982
case kHostname:
983983
if (ch == ':' && !sbflag) {
984984
if (special && buffer.size() == 0)
985-
FAILED()
985+
URL_FAILED()
986986
SET_HAVE_HOST()
987987
if (ParseHost(&buffer, &url.host) < 0)
988-
FAILED()
988+
URL_FAILED()
989989
buffer.clear();
990990
state = kPort;
991991
if (override == kHostname)
@@ -997,10 +997,10 @@ namespace url {
997997
special_back_slash) {
998998
p--;
999999
if (special && buffer.size() == 0)
1000-
FAILED()
1000+
URL_FAILED()
10011001
SET_HAVE_HOST()
10021002
if (ParseHost(&buffer, &url.host) < 0)
1003-
FAILED()
1003+
URL_FAILED()
10041004
buffer.clear();
10051005
state = kPathStart;
10061006
if (state_override)
@@ -1029,14 +1029,14 @@ namespace url {
10291029
if (port >= 0 && port <= 0xffff) {
10301030
url.port = NormalizePort(url.scheme, port);
10311031
} else if (!state_override) {
1032-
FAILED()
1032+
URL_FAILED()
10331033
}
10341034
buffer.clear();
10351035
}
10361036
state = kPathStart;
10371037
continue;
10381038
} else {
1039-
FAILED();
1039+
URL_FAILED();
10401040
}
10411041
break;
10421042
case kFile:
@@ -1151,7 +1151,7 @@ namespace url {
11511151
if (buffer != "localhost") {
11521152
SET_HAVE_HOST()
11531153
if (ParseHost(&buffer, &url.host) < 0)
1154-
FAILED()
1154+
URL_FAILED()
11551155
}
11561156
buffer.clear();
11571157
state = kPathStart;

0 commit comments

Comments
 (0)