Skip to content

Commit 74226d1

Browse files
compnerdcompnerd
committed
Revert "Replace calls to CFStringCreateWithCString with constant CFStrings (#4694)"
This reverts commit bc34587.
1 parent e79e6c4 commit 74226d1

File tree

5 files changed

+27
-29
lines changed

5 files changed

+27
-29
lines changed

‎CoreFoundation/Base.subproj/CFPlatform.c‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -278,11 +278,8 @@ CF_PRIVATE CFStringRef _CFProcessNameString(void) {
278278
static CFStringRef __CFProcessNameString = NULL;
279279
if (!__CFProcessNameString) {
280280
const char *processName = *_CFGetProgname();
281-
CFStringRef newStr;
282-
if (processName)
283-
newStr = CFStringCreateWithCString(kCFAllocatorSystemDefault, processName, kCFPlatformInterfaceStringEncoding);
284-
else
285-
newStr = CFSTR("");
281+
if (!processName) processName = "";
282+
CFStringRef newStr = CFStringCreateWithCString(kCFAllocatorSystemDefault, processName, kCFPlatformInterfaceStringEncoding);
286283
#pragma GCC diagnostic push
287284
#pragma GCC diagnostic ignored "-Wdeprecated"
288285
if (!OSAtomicCompareAndSwapPtrBarrier(NULL, (void *) newStr, (void * volatile *)& __CFProcessNameString)) {
@@ -395,7 +392,7 @@ CF_PRIVATE CFStringRef _CFStringCreateHostName(void) {
395392
char myName[CFMaxHostNameSize];
396393

397394
// return @"" instead of nil a la CFUserName() and Ali Ozer
398-
if (0 != gethostname(myName, CFMaxHostNameSize)) return CFSTR("");
395+
if (0 != gethostname(myName, CFMaxHostNameSize)) myName[0] = '\0';
399396
return CFStringCreateWithCString(kCFAllocatorSystemDefault, myName, kCFPlatformInterfaceStringEncoding);
400397
}
401398

‎CoreFoundation/Locale.subproj/CFDateFormatter.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -979,7 +979,7 @@ static CFMutableStringRef __createISO8601FormatString(CFISO8601DateFormatOptions
979979
}
980980

981981
CFDateFormatterRef CFDateFormatterCreateISO8601Formatter(CFAllocatorRef allocator, CFISO8601DateFormatOptions formatOptions) {
982-
CFStringRef localeStr = CFSTR("en_US_POSIX");
982+
CFStringRef localeStr = CFStringCreateWithCString(kCFAllocatorSystemDefault, "en_US_POSIX", kCFStringEncodingUTF8);
983983
CFLocaleRef locale = CFLocaleCreate(kCFAllocatorSystemDefault, localeStr);
984984
CFDateFormatterRef ISO8601Formatter = __CreateCFDateFormatter(allocator, locale, kCFDateFormatterNoStyle, kCFDateFormatterNoStyle, kCFBooleanTrue); // dateStyle and timeStyle are not relevant for ISO8601
985985

@@ -991,6 +991,7 @@ CFDateFormatterRef CFDateFormatterCreateISO8601Formatter(CFAllocatorRef allocato
991991
}
992992
}
993993

994+
CFRelease(localeStr);
994995
CFRelease(locale);
995996

996997
return ISO8601Formatter;

‎CoreFoundation/Parsing.subproj/CFXMLInterface.c‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ void _CFXMLInterfaceSAX2UnparsedEntityDecl(_CFXMLInterfaceParserContext ctx, con
350350
}
351351

352352
CFErrorRef _CFErrorCreateFromXMLInterface(_CFXMLInterfaceError err) {
353-
return __CFSwiftXMLParserBridgeCF.CFErrorCreate(*(__CFSwiftXMLParserBridgeCF.kCFAllocatorSystemDefault), CFSTR("NSXMLParserErrorDomain"), err->code, NULL);
353+
return __CFSwiftXMLParserBridgeCF.CFErrorCreate(*(__CFSwiftXMLParserBridgeCF.kCFAllocatorSystemDefault), __CFSwiftXMLParserBridgeCF.CFStringCreateWithCString(NULL, "NSXMLParserErrorDomain", kCFStringEncodingUTF8), err->code, NULL);
354354
}
355355

356356
_CFXMLNodePtr _CFXMLNewNode(_CFXMLNamespacePtr namespace, const char* name) {
@@ -594,14 +594,14 @@ void _CFXMLNodeSetContent(_CFXMLNodePtr node, const unsigned char* _Nullable co
594594
// rather than writing custom code to parse the new content into the correct
595595
// xmlElementContent structures, let's leverage what we've already got.
596596
CFMutableStringRef xmlString = __CFSwiftXMLParserBridgeCF.CFStringCreateMutable(NULL, 0);
597-
__CFSwiftXMLParserBridgeCF.CFStringAppend(xmlString, CFSTR("<!ELEMENT "));
597+
__CFSwiftXMLParserBridgeCF.CFStringAppend(xmlString, __CFSwiftXMLParserBridgeCF.CFStringCreateWithCString(NULL, "<!ELEMENT ", kCFStringEncodingUTF8));
598598
__CFSwiftXMLParserBridgeCF.CFStringAppendCString(xmlString, (const char*)element->name, kCFStringEncodingUTF8);
599-
__CFSwiftXMLParserBridgeCF.CFStringAppend(xmlString, CFSTR(" "));
599+
__CFSwiftXMLParserBridgeCF.CFStringAppend(xmlString, __CFSwiftXMLParserBridgeCF.CFStringCreateWithCString(NULL, " ", kCFStringEncodingUTF8));
600600
__CFSwiftXMLParserBridgeCF.CFStringAppendCString(xmlString, (const char*)content, kCFStringEncodingUTF8);
601-
__CFSwiftXMLParserBridgeCF.CFStringAppend(xmlString, CFSTR(">"));
601+
__CFSwiftXMLParserBridgeCF.CFStringAppend(xmlString, __CFSwiftXMLParserBridgeCF.CFStringCreateWithCString(NULL, ">", kCFStringEncodingUTF8));
602602

603603
size_t bufferSize = __CFSwiftXMLParserBridgeCF.CFStringGetMaximumSizeForEncoding(__CFSwiftXMLParserBridgeCF.CFStringGetLength(xmlString), kCFStringEncodingUTF8) + 1;
604-
char* buffer = calloc(1, bufferSize);
604+
char* buffer = calloc(bufferSize, 1);
605605
__CFSwiftXMLParserBridgeCF.CFStringGetCString(xmlString, buffer, bufferSize, kCFStringEncodingUTF8);
606606
xmlElementPtr resultNode = _CFXMLParseDTDNode((const xmlChar*)buffer);
607607

@@ -864,35 +864,35 @@ CFStringRef _CFXMLCopyStringWithOptions(_CFXMLNodePtr node, uint32_t options) {
864864
// predefined entities need special handling, libxml2 just tosses an error and returns a NULL string
865865
// if we try to use xmlSaveTree on a predefined entity
866866
CFMutableStringRef result = __CFSwiftXMLParserBridgeCF.CFStringCreateMutable(NULL, 0);
867-
__CFSwiftXMLParserBridgeCF.CFStringAppend(result, CFSTR("<!ENTITY "));
867+
__CFSwiftXMLParserBridgeCF.CFStringAppend(result, __CFSwiftXMLParserBridgeCF.CFStringCreateWithCString(NULL, "<!ENTITY ", kCFStringEncodingUTF8));
868868
__CFSwiftXMLParserBridgeCF.CFStringAppendCString(result, (const char*)((xmlEntityPtr)node)->name, kCFStringEncodingUTF8);
869-
__CFSwiftXMLParserBridgeCF.CFStringAppend(result, CFSTR(" \""));
869+
__CFSwiftXMLParserBridgeCF.CFStringAppend(result, __CFSwiftXMLParserBridgeCF.CFStringCreateWithCString(NULL, " \"", kCFStringEncodingUTF8));
870870
__CFSwiftXMLParserBridgeCF.CFStringAppendCString(result, (const char*)((xmlEntityPtr)node)->content, kCFStringEncodingUTF8);
871-
__CFSwiftXMLParserBridgeCF.CFStringAppend(result, CFSTR("\">"));
871+
__CFSwiftXMLParserBridgeCF.CFStringAppend(result, __CFSwiftXMLParserBridgeCF.CFStringCreateWithCString(NULL, "\">", kCFStringEncodingUTF8));
872872

873873
return result;
874874
} else if (((xmlNodePtr)node)->type == XML_NOTATION_NODE) {
875875
// This is not actually a thing that occurs naturally in libxml2
876876
xmlNotationPtr notation = ((_cfxmlNotation*)node)->notation;
877877
CFMutableStringRef result = __CFSwiftXMLParserBridgeCF.CFStringCreateMutable(NULL, 0);
878-
__CFSwiftXMLParserBridgeCF.CFStringAppend(result, CFSTR("<!NOTATION "));
878+
__CFSwiftXMLParserBridgeCF.CFStringAppend(result, __CFSwiftXMLParserBridgeCF.CFStringCreateWithCString(NULL, "<!NOTATION ", kCFStringEncodingUTF8));
879879
__CFSwiftXMLParserBridgeCF.CFStringAppendCString(result, (const char*)notation->name, kCFStringEncodingUTF8);
880-
__CFSwiftXMLParserBridgeCF.CFStringAppend(result, CFSTR(" "));
880+
__CFSwiftXMLParserBridgeCF.CFStringAppend(result, __CFSwiftXMLParserBridgeCF.CFStringCreateWithCString(NULL, " ", kCFStringEncodingUTF8));
881881
if (notation->PublicID == NULL && notation->SystemID != NULL) {
882-
__CFSwiftXMLParserBridgeCF.CFStringAppend(result, CFSTR("SYSTEM "));
882+
__CFSwiftXMLParserBridgeCF.CFStringAppend(result, __CFSwiftXMLParserBridgeCF.CFStringCreateWithCString(NULL, "SYSTEM ", kCFStringEncodingUTF8));
883883
} else if (notation->PublicID != NULL) {
884-
__CFSwiftXMLParserBridgeCF.CFStringAppend(result, CFSTR("PUBLIC \""));
884+
__CFSwiftXMLParserBridgeCF.CFStringAppend(result, __CFSwiftXMLParserBridgeCF.CFStringCreateWithCString(NULL, "PUBLIC \"", kCFStringEncodingUTF8));
885885
__CFSwiftXMLParserBridgeCF.CFStringAppendCString(result, (const char*)notation->PublicID, kCFStringEncodingUTF8);
886-
__CFSwiftXMLParserBridgeCF.CFStringAppend(result, CFSTR("\""));
886+
__CFSwiftXMLParserBridgeCF.CFStringAppend(result, __CFSwiftXMLParserBridgeCF.CFStringCreateWithCString(NULL, "\"", kCFStringEncodingUTF8));
887887
}
888888

889889
if (notation->SystemID != NULL) {
890-
__CFSwiftXMLParserBridgeCF.CFStringAppend(result, CFSTR("\""));
890+
__CFSwiftXMLParserBridgeCF.CFStringAppend(result, __CFSwiftXMLParserBridgeCF.CFStringCreateWithCString(NULL, "\"", kCFStringEncodingUTF8));
891891
__CFSwiftXMLParserBridgeCF.CFStringAppendCString(result, (const char*)notation->SystemID, kCFStringEncodingUTF8);
892-
__CFSwiftXMLParserBridgeCF.CFStringAppend(result, CFSTR("\""));
892+
__CFSwiftXMLParserBridgeCF.CFStringAppend(result, __CFSwiftXMLParserBridgeCF.CFStringCreateWithCString(NULL, "\"", kCFStringEncodingUTF8));
893893
}
894894

895-
__CFSwiftXMLParserBridgeCF.CFStringAppend(result, CFSTR(" >"));
895+
__CFSwiftXMLParserBridgeCF.CFStringAppend(result, __CFSwiftXMLParserBridgeCF.CFStringCreateWithCString(NULL, " >", kCFStringEncodingUTF8));
896896

897897
return result;
898898
}
@@ -918,7 +918,7 @@ CFStringRef _CFXMLCopyStringWithOptions(_CFXMLNodePtr node, uint32_t options) {
918918
int error = xmlSaveClose(ctx);
919919

920920
if (error == -1) {
921-
return CFSTR("");
921+
return __CFSwiftXMLParserBridgeCF.CFStringCreateWithCString(NULL, "", kCFStringEncodingUTF8);
922922
}
923923

924924
const xmlChar* bufferContents = xmlBufferContent(buffer);
@@ -1111,7 +1111,7 @@ bool _CFXMLDocValidate(_CFXMLDocPtr doc, CFErrorRef _Nullable * error) {
11111111
CFMutableDictionaryRef userInfo = __CFSwiftXMLParserBridgeCF.CFDictionaryCreateMutable(NULL, 1, __CFSwiftXMLParserBridgeCF.kCFCopyStringDictionaryKeyCallBacks, __CFSwiftXMLParserBridgeCF.kCFTypeDictionaryValueCallBacks);
11121112
__CFSwiftXMLParserBridgeCF.CFDictionarySetValue(userInfo, *(__CFSwiftXMLParserBridgeCF.kCFErrorLocalizedDescriptionKey), errorMessage);
11131113

1114-
*error = __CFSwiftXMLParserBridgeCF.CFErrorCreate(NULL, CFSTR("NSXMLParserErrorDomain"), 0, userInfo);
1114+
*error = __CFSwiftXMLParserBridgeCF.CFErrorCreate(NULL, __CFSwiftXMLParserBridgeCF.CFStringCreateWithCString(NULL, "NSXMLParserErrorDomain", kCFStringEncodingUTF8), 0, userInfo);
11151115

11161116
__CFSwiftXMLParserBridgeCF.CFRelease(userInfo);
11171117
}
@@ -1177,7 +1177,7 @@ _CFXMLDTDPtr _Nullable _CFXMLParseDTDFromData(CFDataRef data, CFErrorRef _Nullab
11771177
CFMutableDictionaryRef userInfo = __CFSwiftXMLParserBridgeCF.CFDictionaryCreateMutable(NULL, 1, __CFSwiftXMLParserBridgeCF.kCFCopyStringDictionaryKeyCallBacks, __CFSwiftXMLParserBridgeCF.kCFTypeDictionaryValueCallBacks);
11781178
__CFSwiftXMLParserBridgeCF.CFDictionarySetValue(userInfo, *(__CFSwiftXMLParserBridgeCF.kCFErrorLocalizedDescriptionKey), errorMessage);
11791179

1180-
*error = __CFSwiftXMLParserBridgeCF.CFErrorCreate(NULL, CFSTR("NSXMLParserErrorDomain"), 0, userInfo);
1180+
*error = __CFSwiftXMLParserBridgeCF.CFErrorCreate(NULL, __CFSwiftXMLParserBridgeCF.CFStringCreateWithCString(NULL, "NSXMLParserErrorDomain", kCFStringEncodingUTF8), 0, userInfo);
11811181

11821182
__CFSwiftXMLParserBridgeCF.CFRelease(userInfo);
11831183
}

‎CoreFoundation/Preferences.subproj/CFPreferences.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,7 @@ CF_PRIVATE CFArrayRef _CFPreferencesCreateDomainList(CFStringRef userName, CFSt
558558
return NULL;
559559
}
560560
if (hostName == kCFPreferencesAnyHost) {
561-
suffix = CFSTR(".plist");
561+
suffix = CFStringCreateWithCString(prefAlloc, ".plist", kCFStringEncodingASCII);
562562
} else if (hostName == kCFPreferencesCurrentHost) {
563563
CFStringRef hostID = _CFPreferencesGetByHostIdentifierString();
564564
suffix = CFStringCreateWithFormat(prefAlloc, NULL, CFSTR(".%@.plist"), hostID);

‎CoreFoundation/URL.subproj/CFURL.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4058,9 +4058,9 @@ static CFStringRef WindowsPathToURLPath(CFStringRef path, CFAllocatorRef alloc,
40584058
CFArrayRef urlComponents;
40594059
CFStringRef str;
40604060

4061-
if (CFStringGetLength(path) == 0) return CFSTR("");
4061+
if (CFStringGetLength(path) == 0) return CFStringCreateWithCString(alloc, "", kCFStringEncodingASCII);
40624062
urlComponents = WindowsPathToURLComponents(path, alloc, isDir, isAbsolute);
4063-
if (!urlComponents) return CFSTR("");
4063+
if (!urlComponents) return CFStringCreateWithCString(alloc, "", kCFStringEncodingASCII);
40644064

40654065
// WindowsPathToURLComponents already added percent escapes for us; no need to add them again here.
40664066
str = CFStringCreateByCombiningStrings(alloc, urlComponents, CFSTR("/"));

0 commit comments

Comments
 (0)