Skip to content

Commit 311d1b2

Browse files
authored
Merge pull request #2933 from apple/revert-2929-feature/URLComponents.percentEncodedQueryItems
Revert "Add support and tests for URLComponents.percentEncodedQueryItems"
2 parents abdc0e1 + d7957de commit 311d1b2

File tree

5 files changed

+70
-357
lines changed

5 files changed

+70
-357
lines changed

CoreFoundation/URL.subproj/CFURLComponents.c

+2-4
Original file line numberDiff line numberDiff line change
@@ -1282,7 +1282,7 @@ static CFArrayRef _CFURLComponentsCopyQueryItemsInternal(CFURLComponentsRef comp
12821282
}
12831283
}
12841284
else {
1285-
nameString = CFRetain(CFSTR(""));
1285+
nameString = CFSTR("");
12861286
}
12871287
CFTypeRef keys[] = {_kCFURLComponentsNameKey};
12881288
CFTypeRef values[] = {nameString};
@@ -1343,7 +1343,7 @@ static CFArrayRef _CFURLComponentsCopyQueryItemsInternal(CFURLComponentsRef comp
13431343
}
13441344
}
13451345
else {
1346-
nameString = CFRetain(CFSTR(""));
1346+
nameString = CFSTR("");
13471347
}
13481348
CFTypeRef keys[] = {_kCFURLComponentsNameKey};
13491349
CFTypeRef values[] = {nameString};
@@ -1464,8 +1464,6 @@ static Boolean _CFURLComponentsSetQueryItemsInternal(CFURLComponentsRef componen
14641464
return ( result );
14651465
}
14661466

1467-
1468-
14691467
CF_EXPORT void _CFURLComponentsSetQueryItems(CFURLComponentsRef components, CFArrayRef names, CFArrayRef values ) {
14701468
(void)_CFURLComponentsSetQueryItemsInternal(components, names, values, true); // _CFURLComponentsSetQueryItemsInternal cannot fail if addPercentEncoding is true
14711469
}

0 commit comments

Comments
 (0)