Skip to content

Commit 0374c7d

Browse files
authored
Merge pull request #2598 from 3405691582/CF_BooleanTypeConversion
[CF] Match some declarations with their headers.
2 parents b280852 + 57b3f15 commit 0374c7d

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

CoreFoundation/Locale.subproj/CFCalendar.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -604,7 +604,7 @@ static CFStringRef _CFCalendarGetCanonicalIdentifier(CFStringRef identifier) {
604604
return canonicalIdent;
605605
}
606606

607-
CF_CROSS_PLATFORM_EXPORT bool _CFCalendarInitWithIdentifier(CFCalendarRef calendar, CFStringRef identifier) {
607+
CF_CROSS_PLATFORM_EXPORT Boolean _CFCalendarInitWithIdentifier(CFCalendarRef calendar, CFStringRef identifier) {
608608
CFStringRef canonicalIdent = _CFCalendarGetCanonicalIdentifier(identifier);
609609
if (!canonicalIdent) ICU_LOG(" // _CFCalendarInitWithIdentifier exit false 1\n");
610610
if (!canonicalIdent) return false;

CoreFoundation/Parsing.subproj/CFPropertyList.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2642,7 +2642,7 @@ CFTypeRef _CFPropertyListCreateFromXMLString(CFAllocatorRef allocator, CFStringR
26422642
CF_PRIVATE bool __CFBinaryPlistCreateObjectFiltered(const uint8_t *databytes, uint64_t datalen, uint64_t startOffset, const CFBinaryPlistTrailer *trailer, CFAllocatorRef allocator, CFOptionFlags mutabilityOption, CFMutableDictionaryRef objects, CFMutableSetRef set, CFIndex curDepth, CFSetRef keyPaths, CFPropertyListRef *plist);
26432643

26442644
// Returns a subset of the property list, only including the key paths in the CFSet.
2645-
bool _CFPropertyListCreateFiltered(CFAllocatorRef allocator, CFDataRef data, CFOptionFlags option, CFSetRef keyPaths, CFPropertyListRef *value, CFErrorRef *error) {
2645+
Boolean _CFPropertyListCreateFiltered(CFAllocatorRef allocator, CFDataRef data, CFOptionFlags option, CFSetRef keyPaths, CFPropertyListRef *value, CFErrorRef *error) {
26462646

26472647
if (!keyPaths || !data) {
26482648
return false;
@@ -2691,7 +2691,7 @@ bool _CFPropertyListCreateFiltered(CFAllocatorRef allocator, CFDataRef data, CFO
26912691
@param error If an error occurs, will be set to a valid CFErrorRef. It is the caller's responsibility to release this value.
26922692
@return True if the key is found, false otherwise.
26932693
*/
2694-
bool _CFPropertyListCreateSingleValue(CFAllocatorRef allocator, CFDataRef data, CFOptionFlags option, CFStringRef keyPath, CFPropertyListRef *value, CFErrorRef *error) {
2694+
Boolean _CFPropertyListCreateSingleValue(CFAllocatorRef allocator, CFDataRef data, CFOptionFlags option, CFStringRef keyPath, CFPropertyListRef *value, CFErrorRef *error) {
26952695

26962696
if (!keyPath || CFStringGetLength(keyPath) == 0) {
26972697
return false;

0 commit comments

Comments
 (0)