From e588f5617728fcfb77f077c81f68134781384461 Mon Sep 17 00:00:00 2001 From: Apple Date: Thu, 1 Apr 2010 23:13:34 +0000 Subject: [PATCH] CF-550.19.tar.gz --- CFApplicationPreferences.c | 2 +- CFArray.c | 2 +- CFArray.h | 2 +- CFBag.c | 2 +- CFBag.h | 2 +- CFBase.c | 2 +- CFBase.h | 2 +- CFBasicHash.h | 2 +- CFBasicHash.m | 2 +- CFBinaryHeap.c | 2 +- CFBinaryHeap.h | 2 +- CFBinaryPList.c | 2 +- CFBitVector.c | 2 +- CFBitVector.h | 2 +- CFBuiltinConverters.c | 2 +- CFBundle.c | 2 +- CFBundle.h | 2 +- CFBundlePriv.h | 2 +- CFBundle_BinaryTypes.h | 2 +- CFBundle_Internal.h | 2 +- CFBundle_Resources.c | 2 +- CFByteOrder.h | 2 +- CFCalendar.c | 2 +- CFCalendar.h | 2 +- CFCharacterSet.c | 2 +- CFCharacterSet.h | 2 +- CFCharacterSetPriv.h | 2 +- CFConcreteStreams.c | 2 +- CFData.c | 2 +- CFData.h | 2 +- CFDate.c | 2 +- CFDate.h | 2 +- CFDateFormatter.c | 2 +- CFDateFormatter.h | 2 +- CFDictionary.c | 2 +- CFDictionary.h | 2 +- CFError.c | 2 +- CFError.h | 2 +- CFError_Private.h | 2 +- CFFileUtilities.c | 2 +- CFICUConverters.c | 2 +- CFICUConverters.h | 2 +- CFInternal.h | 4 +- CFLocale.c | 2 +- CFLocale.h | 2 +- CFLocaleIdentifier.c | 2 +- CFLocaleInternal.h | 2 +- CFLocaleKeys.m | 2 +- CFLogUtilities.h | 2 +- CFMachPort.c | 2 +- CFMachPort.h | 2 +- CFMessagePort.c | 2 +- CFMessagePort.h | 2 +- CFNumber.c | 2 +- CFNumber.h | 2 +- CFNumberFormatter.c | 2 +- CFNumberFormatter.h | 2 +- CFPlatform.c | 2 +- CFPlatformConverters.c | 2 +- CFPlugIn.c | 2 +- CFPlugIn.h | 2 +- CFPlugInCOM.h | 2 +- CFPlugIn_Factory.c | 2 +- CFPlugIn_Factory.h | 2 +- CFPlugIn_Instance.c | 2 +- CFPlugIn_PlugIn.c | 2 +- CFPreferences.c | 2 +- CFPreferences.h | 2 +- CFPriv.h | 2 +- CFPropertyList.c | 2 +- CFPropertyList.h | 2 +- CFRunLoop.c | 2 +- CFRunLoop.h | 2 +- CFRuntime.c | 2 +- CFRuntime.h | 2 +- CFSet.c | 2 +- CFSet.h | 2 +- CFSocket.c | 2 +- CFSocket.h | 2 +- CFSocketStream.c | 2 +- CFSortFunctions.c | 2 +- CFStorage.c | 2 +- CFStorage.h | 2 +- CFStream.c | 353 ++++++++++++++++++++------------ CFStream.h | 2 +- CFStreamAbstract.h | 2 +- CFStreamInternal.h | 2 +- CFStreamPriv.h | 2 +- CFString.c | 2 +- CFString.h | 2 +- CFStringDefaultEncoding.h | 2 +- CFStringEncodingConverter.c | 2 +- CFStringEncodingConverter.h | 2 +- CFStringEncodingConverterExt.h | 2 +- CFStringEncodingConverterPriv.h | 2 +- CFStringEncodingDatabase.c | 2 +- CFStringEncodingDatabase.h | 2 +- CFStringEncodingExt.h | 2 +- CFStringEncodings.c | 2 +- CFStringScanner.c | 2 +- CFStringUtilities.c | 2 +- CFSystemDirectories.c | 2 +- CFTimeZone.c | 2 +- CFTimeZone.h | 2 +- CFTree.c | 2 +- CFTree.h | 2 +- CFURL.c | 2 +- CFURL.h | 2 +- CFURLAccess.c | 2 +- CFURLAccess.h | 2 +- CFUUID.c | 2 +- CFUUID.h | 2 +- CFUniChar.c | 2 +- CFUniChar.h | 2 +- CFUniCharPriv.h | 2 +- CFUnicodeDecomposition.c | 2 +- CFUnicodeDecomposition.h | 2 +- CFUnicodePrecomposition.c | 2 +- CFUnicodePrecomposition.h | 2 +- CFUserNotification.c | 2 +- CFUserNotification.h | 2 +- CFUtilities.c | 2 +- CFVersion.c | 6 +- CFXMLInputStream.c | 2 +- CFXMLInputStream.h | 2 +- CFXMLNode.c | 2 +- CFXMLNode.h | 2 +- CFXMLParser.c | 2 +- CFXMLParser.h | 2 +- CFXMLPreferencesDomain.c | 2 +- CFXMLTree.c | 2 +- CoreFoundation.h | 2 +- CoreFoundation_Prefix.h | 2 +- ForFoundationOnly.h | 2 +- Info.plist | 2 +- 135 files changed, 360 insertions(+), 267 deletions(-) diff --git a/CFApplicationPreferences.c b/CFApplicationPreferences.c index 985e7e4..864f0c7 100644 --- a/CFApplicationPreferences.c +++ b/CFApplicationPreferences.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFArray.c b/CFArray.c index f09f90c..dced26d 100644 --- a/CFArray.c +++ b/CFArray.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFArray.h b/CFArray.h index 96281d1..6e1f843 100644 --- a/CFArray.h +++ b/CFArray.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFBag.c b/CFBag.c index d708844..facf851 100644 --- a/CFBag.c +++ b/CFBag.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFBag.h b/CFBag.h index 21460ca..d56d54e 100644 --- a/CFBag.h +++ b/CFBag.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFBase.c b/CFBase.c index daeb790..584dc4b 100644 --- a/CFBase.c +++ b/CFBase.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFBase.h b/CFBase.h index 9cb933c..b046940 100644 --- a/CFBase.h +++ b/CFBase.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFBasicHash.h b/CFBasicHash.h index 856a2cf..b959da3 100644 --- a/CFBasicHash.h +++ b/CFBasicHash.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFBasicHash.m b/CFBasicHash.m index b101220..f932d5f 100644 --- a/CFBasicHash.m +++ b/CFBasicHash.m @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFBinaryHeap.c b/CFBinaryHeap.c index f7ad579..6203df3 100644 --- a/CFBinaryHeap.c +++ b/CFBinaryHeap.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFBinaryHeap.h b/CFBinaryHeap.h index d71a839..a5e2cc6 100644 --- a/CFBinaryHeap.h +++ b/CFBinaryHeap.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFBinaryPList.c b/CFBinaryPList.c index 9a29a14..4ca94c8 100644 --- a/CFBinaryPList.c +++ b/CFBinaryPList.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFBitVector.c b/CFBitVector.c index 4a11fba..cc319c6 100644 --- a/CFBitVector.c +++ b/CFBitVector.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFBitVector.h b/CFBitVector.h index 2802cf0..b5c5851 100644 --- a/CFBitVector.h +++ b/CFBitVector.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFBuiltinConverters.c b/CFBuiltinConverters.c index f60f727..49e0a67 100644 --- a/CFBuiltinConverters.c +++ b/CFBuiltinConverters.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFBundle.c b/CFBundle.c index 6921cbd..4b29fb4 100644 --- a/CFBundle.c +++ b/CFBundle.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFBundle.h b/CFBundle.h index 592c066..04b1367 100644 --- a/CFBundle.h +++ b/CFBundle.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFBundlePriv.h b/CFBundlePriv.h index 7d427e9..fb43736 100644 --- a/CFBundlePriv.h +++ b/CFBundlePriv.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFBundle_BinaryTypes.h b/CFBundle_BinaryTypes.h index a0fa7fc..f891583 100644 --- a/CFBundle_BinaryTypes.h +++ b/CFBundle_BinaryTypes.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFBundle_Internal.h b/CFBundle_Internal.h index 472c529..0f47749 100644 --- a/CFBundle_Internal.h +++ b/CFBundle_Internal.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFBundle_Resources.c b/CFBundle_Resources.c index c4b7675..6a1b6ec 100644 --- a/CFBundle_Resources.c +++ b/CFBundle_Resources.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFByteOrder.h b/CFByteOrder.h index e8f088a..209f201 100644 --- a/CFByteOrder.h +++ b/CFByteOrder.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFCalendar.c b/CFCalendar.c index 6d3e8d4..558a531 100644 --- a/CFCalendar.c +++ b/CFCalendar.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFCalendar.h b/CFCalendar.h index 6fe4b89..438e02d 100644 --- a/CFCalendar.h +++ b/CFCalendar.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFCharacterSet.c b/CFCharacterSet.c index cc8598d..51416aa 100644 --- a/CFCharacterSet.c +++ b/CFCharacterSet.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFCharacterSet.h b/CFCharacterSet.h index af7285d..0d1ccce 100644 --- a/CFCharacterSet.h +++ b/CFCharacterSet.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFCharacterSetPriv.h b/CFCharacterSetPriv.h index 158f423..dc2ddae 100644 --- a/CFCharacterSetPriv.h +++ b/CFCharacterSetPriv.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFConcreteStreams.c b/CFConcreteStreams.c index abbd5a4..b492996 100644 --- a/CFConcreteStreams.c +++ b/CFConcreteStreams.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFData.c b/CFData.c index 62db767..9c16c27 100644 --- a/CFData.c +++ b/CFData.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFData.h b/CFData.h index 2d7f173..55a8961 100644 --- a/CFData.h +++ b/CFData.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFDate.c b/CFDate.c index 252f4d4..438f2e4 100644 --- a/CFDate.c +++ b/CFDate.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFDate.h b/CFDate.h index b2df7a9..77a41f9 100644 --- a/CFDate.h +++ b/CFDate.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFDateFormatter.c b/CFDateFormatter.c index ee6696b..53af35f 100644 --- a/CFDateFormatter.c +++ b/CFDateFormatter.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFDateFormatter.h b/CFDateFormatter.h index c592255..cbc87df 100644 --- a/CFDateFormatter.h +++ b/CFDateFormatter.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFDictionary.c b/CFDictionary.c index c12ff50..fb47630 100644 --- a/CFDictionary.c +++ b/CFDictionary.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFDictionary.h b/CFDictionary.h index 778802f..6c3bbab 100644 --- a/CFDictionary.h +++ b/CFDictionary.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFError.c b/CFError.c index 3a19acb..ca1e908 100644 --- a/CFError.c +++ b/CFError.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFError.h b/CFError.h index 629e113..47cef6a 100644 --- a/CFError.h +++ b/CFError.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFError_Private.h b/CFError_Private.h index 5114d36..f3e7ae0 100644 --- a/CFError_Private.h +++ b/CFError_Private.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFFileUtilities.c b/CFFileUtilities.c index 85993d7..f16d0a5 100644 --- a/CFFileUtilities.c +++ b/CFFileUtilities.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFICUConverters.c b/CFICUConverters.c index bb19247..da91618 100644 --- a/CFICUConverters.c +++ b/CFICUConverters.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFICUConverters.h b/CFICUConverters.h index b2c7232..47fe65f 100644 --- a/CFICUConverters.h +++ b/CFICUConverters.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFInternal.h b/CFInternal.h index d85772e..aa1228a 100644 --- a/CFInternal.h +++ b/CFInternal.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * @@ -345,8 +345,8 @@ const CFStringRef S = (CFStringRef) & __ ## S ## __; #define PE_CONST_STRING_DECL(S, V) \ static struct CF_CONST_STRING __ ## S ## __ = {{(uintptr_t)&__CFConstantStringClassReference, {0xc8, 0x07, 0x00, 0x00}}, (uint8_t *)(V), sizeof(V) - 1}; \ __private_extern__ const CFStringRef S = (CFStringRef) & __ ## S ## __; -#endif #endif // __BIG_ENDIAN__ +#endif // __CONSTANT_CFSTRINGS__ /* Buffer size for file pathname */ diff --git a/CFLocale.c b/CFLocale.c index ba125fa..fbec52e 100644 --- a/CFLocale.c +++ b/CFLocale.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFLocale.h b/CFLocale.h index 28b7dd5..03b7918 100644 --- a/CFLocale.h +++ b/CFLocale.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFLocaleIdentifier.c b/CFLocaleIdentifier.c index b8bad79..f014d32 100644 --- a/CFLocaleIdentifier.c +++ b/CFLocaleIdentifier.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFLocaleInternal.h b/CFLocaleInternal.h index 509d93b..68d58ba 100644 --- a/CFLocaleInternal.h +++ b/CFLocaleInternal.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFLocaleKeys.m b/CFLocaleKeys.m index 0873fd6..5e5ec12 100644 --- a/CFLocaleKeys.m +++ b/CFLocaleKeys.m @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFLogUtilities.h b/CFLogUtilities.h index 18cae3c..12ff4b8 100644 --- a/CFLogUtilities.h +++ b/CFLogUtilities.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFMachPort.c b/CFMachPort.c index 4547805..abdf281 100644 --- a/CFMachPort.c +++ b/CFMachPort.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFMachPort.h b/CFMachPort.h index b3e034c..35c9bc4 100644 --- a/CFMachPort.h +++ b/CFMachPort.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFMessagePort.c b/CFMessagePort.c index b8a92a9..569b6a0 100644 --- a/CFMessagePort.c +++ b/CFMessagePort.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFMessagePort.h b/CFMessagePort.h index 5a6bb4a..5bf900c 100644 --- a/CFMessagePort.h +++ b/CFMessagePort.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFNumber.c b/CFNumber.c index 245192e..d4b3bfa 100644 --- a/CFNumber.c +++ b/CFNumber.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFNumber.h b/CFNumber.h index 5173bb2..070e83a 100644 --- a/CFNumber.h +++ b/CFNumber.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFNumberFormatter.c b/CFNumberFormatter.c index 83ec597..617a6ad 100644 --- a/CFNumberFormatter.c +++ b/CFNumberFormatter.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFNumberFormatter.h b/CFNumberFormatter.h index 3fde5a8..970354b 100644 --- a/CFNumberFormatter.h +++ b/CFNumberFormatter.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFPlatform.c b/CFPlatform.c index a840ae4..e6d0219 100644 --- a/CFPlatform.c +++ b/CFPlatform.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFPlatformConverters.c b/CFPlatformConverters.c index b235a9f..25b22b9 100644 --- a/CFPlatformConverters.c +++ b/CFPlatformConverters.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFPlugIn.c b/CFPlugIn.c index 8b48bad..a12881d 100644 --- a/CFPlugIn.c +++ b/CFPlugIn.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFPlugIn.h b/CFPlugIn.h index c044be3..9d4813d 100644 --- a/CFPlugIn.h +++ b/CFPlugIn.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFPlugInCOM.h b/CFPlugInCOM.h index a31c9dd..e826b16 100644 --- a/CFPlugInCOM.h +++ b/CFPlugInCOM.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFPlugIn_Factory.c b/CFPlugIn_Factory.c index 70eee0b..c0232d5 100644 --- a/CFPlugIn_Factory.c +++ b/CFPlugIn_Factory.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFPlugIn_Factory.h b/CFPlugIn_Factory.h index e606087..36aa70f 100644 --- a/CFPlugIn_Factory.h +++ b/CFPlugIn_Factory.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFPlugIn_Instance.c b/CFPlugIn_Instance.c index 7ec2dc8..8923155 100644 --- a/CFPlugIn_Instance.c +++ b/CFPlugIn_Instance.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFPlugIn_PlugIn.c b/CFPlugIn_PlugIn.c index 50cc9ca..d24a6be 100644 --- a/CFPlugIn_PlugIn.c +++ b/CFPlugIn_PlugIn.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFPreferences.c b/CFPreferences.c index f9d5665..ed005b5 100644 --- a/CFPreferences.c +++ b/CFPreferences.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFPreferences.h b/CFPreferences.h index 3a4a5bb..43c04d4 100644 --- a/CFPreferences.h +++ b/CFPreferences.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFPriv.h b/CFPriv.h index 0d34c2d..1a160dc 100644 --- a/CFPriv.h +++ b/CFPriv.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFPropertyList.c b/CFPropertyList.c index 9650ed0..adb164f 100644 --- a/CFPropertyList.c +++ b/CFPropertyList.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFPropertyList.h b/CFPropertyList.h index 8052fa9..219dc7a 100644 --- a/CFPropertyList.h +++ b/CFPropertyList.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFRunLoop.c b/CFRunLoop.c index d58bc34..d38b717 100644 --- a/CFRunLoop.c +++ b/CFRunLoop.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFRunLoop.h b/CFRunLoop.h index 14088b8..cc9f923 100644 --- a/CFRunLoop.h +++ b/CFRunLoop.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFRuntime.c b/CFRuntime.c index b596782..1c5c2aa 100644 --- a/CFRuntime.c +++ b/CFRuntime.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFRuntime.h b/CFRuntime.h index e634efc..66c8306 100644 --- a/CFRuntime.h +++ b/CFRuntime.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFSet.c b/CFSet.c index 4881a64..f23f4f9 100644 --- a/CFSet.c +++ b/CFSet.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFSet.h b/CFSet.h index 4833765..a638d7e 100644 --- a/CFSet.h +++ b/CFSet.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFSocket.c b/CFSocket.c index 357d2e3..bf049f7 100644 --- a/CFSocket.c +++ b/CFSocket.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFSocket.h b/CFSocket.h index 94656cd..3653bf5 100644 --- a/CFSocket.h +++ b/CFSocket.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFSocketStream.c b/CFSocketStream.c index d8a14b5..88326a4 100644 --- a/CFSocketStream.c +++ b/CFSocketStream.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFSortFunctions.c b/CFSortFunctions.c index b8e9bf2..f4c5b5a 100644 --- a/CFSortFunctions.c +++ b/CFSortFunctions.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFStorage.c b/CFStorage.c index 8500024..37073c2 100644 --- a/CFStorage.c +++ b/CFStorage.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFStorage.h b/CFStorage.h index c81ac96..86db40f 100644 --- a/CFStorage.h +++ b/CFStorage.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFStream.c b/CFStream.c index d28ae16..0a2ba5e 100644 --- a/CFStream.c +++ b/CFStream.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * @@ -33,6 +33,9 @@ #include "CFInternal.h" #include +struct CFStreamAux { + CFSpinLock_t streamLock; +}; enum { MIN_STATUS_CODE_BIT = 0, @@ -73,6 +76,77 @@ __private_extern__ CFStreamStatus _CFStreamGetStatus(struct _CFStream *stream); static Boolean _CFStreamRemoveRunLoopAndModeFromArray(CFMutableArrayRef runLoopsAndModes, CFRunLoopRef rl, CFStringRef mode); static void _wakeUpRunLoop(struct _CFStream *stream); +CF_INLINE void* _CFStreamCreateReserved(CFAllocatorRef alloc) { + struct CFStreamAux* aux = (struct CFStreamAux*) CFAllocatorAllocate(alloc, sizeof(struct CFStreamAux), 0); + if (aux) { + aux->streamLock = CFSpinLockInit; + } + return aux; +} + +CF_INLINE void _CFStreamDestroyReserved(CFAllocatorRef alloc, void* aux) { + CFAllocatorDeallocate(alloc, aux); +} + +CF_INLINE struct CFStreamAux* _CFStreamGetAuxRecord(struct _CFStream* stream) { + return (struct CFStreamAux*) stream->_reserved1; +} + +CF_INLINE void _CFStreamLock(struct _CFStream* stream) { + __CFSpinLock(&_CFStreamGetAuxRecord(stream)->streamLock); +} + +CF_INLINE void _CFStreamUnlock(struct _CFStream* stream) { + __CFSpinUnlock(&_CFStreamGetAuxRecord(stream)->streamLock); +} + +CF_INLINE CFRunLoopSourceRef _CFStreamCopySource(struct _CFStream* stream) { + CFRunLoopSourceRef source = NULL; + + if (stream) { + _CFStreamLock(stream); + + if (stream->client) + source = stream->client->rlSource; + + if (source) + CFRetain(source); + + _CFStreamUnlock(stream); + } + + return source; +} + +CF_INLINE void _CFStreamSetSource(struct _CFStream* stream, CFRunLoopSourceRef source, Boolean invalidateOldSource) { + CFRunLoopSourceRef oldSource = NULL; + + if (stream) { + _CFStreamLock(stream); + if (stream->client) { + oldSource = stream->client->rlSource; + if (oldSource != NULL) + CFRetain(oldSource); + + stream->client->rlSource = source; + if (source != NULL) + CFRetain(source); + } + _CFStreamUnlock(stream); + } + + if (oldSource) { + // Lose our extra retain + CFRelease(oldSource); + + if (invalidateOldSource) + CFRunLoopSourceInvalidate(oldSource); + + // And lose the one that held it in our stream as well + CFRelease(oldSource); + } +} + CF_INLINE const struct _CFStreamCallBacks *_CFStreamGetCallBackPtr(struct _CFStream *stream) { return stream->callBacks; } @@ -87,11 +161,16 @@ CF_INLINE void _CFStreamSetStatusCode(struct _CFStream *stream, CFStreamStatus n } CF_INLINE void _CFStreamScheduleEvent(struct _CFStream *stream, CFStreamEventType event) { - if (stream->client && (stream->client->when & event) && stream->client->rlSource) { - stream->client->whatToSignal |= event; - CFRunLoopSourceSignal(stream->client->rlSource); - _wakeUpRunLoop(stream); - } + if (stream->client && (stream->client->when & event)) { + CFRunLoopSourceRef source = _CFStreamCopySource(stream); + if (source) { + stream->client->whatToSignal |= event; + + CFRunLoopSourceSignal(source); + CFRelease(source); + _wakeUpRunLoop(stream); + } + } } CF_INLINE void _CFStreamSetStreamError(struct _CFStream *stream, CFStreamError *err) { @@ -124,60 +203,67 @@ static CFStringRef __CFStreamCopyDescription(CFTypeRef cf) { return desc; } -__private_extern__ void _CFStreamClose(struct _CFStream *stream) { - CFStreamStatus status = _CFStreamGetStatus(stream); - const struct _CFStreamCallBacks *cb = _CFStreamGetCallBackPtr(stream); - if (status == kCFStreamStatusNotOpen || status == kCFStreamStatusClosed || (status == kCFStreamStatusError && __CFBitIsSet(stream->flags, HAVE_CLOSED))) { - // Stream is not open from the client's perspective; do not callout and do not update our status to "closed" - return; - } - __CFBitSet(stream->flags, HAVE_CLOSED); - __CFBitSet(stream->flags, CALLING_CLIENT); - if (cb->close) { - cb->close(stream, _CFStreamGetInfoPointer(stream)); - } - if (stream->client && stream->client->rlSource) { - +static void _CFStreamDetachSource(struct _CFStream* stream) { + if (stream && stream->client && stream->client->rlSource) { if (!__CFBitIsSet(stream->flags, SHARED_SOURCE)) { - CFRunLoopSourceInvalidate(stream->client->rlSource); - CFRelease(stream->client->rlSource); - stream->client->rlSource = NULL; + _CFStreamSetSource(stream, NULL, TRUE); } else { CFArrayRef runLoopAndSourceKey; CFMutableArrayRef list; - CFIndex c, i; + CFIndex count; + CFIndex i; __CFSpinLock(&sSourceLock); runLoopAndSourceKey = (CFArrayRef)CFDictionaryGetValue(sSharedSources, stream); list = (CFMutableArrayRef)CFDictionaryGetValue(sSharedSources, runLoopAndSourceKey); - c = CFArrayGetCount(list); - i = CFArrayGetFirstIndexOfValue(list, CFRangeMake(0, c), stream); + count = CFArrayGetCount(list); + i = CFArrayGetFirstIndexOfValue(list, CFRangeMake(0, count), stream); if (i != kCFNotFound) { CFArrayRemoveValueAtIndex(list, i); - c--; + count--; } CFAssert(CFArrayGetFirstIndexOfValue(list, CFRangeMake(0, CFArrayGetCount(list)), stream) == kCFNotFound, __kCFLogAssertion, "CFStreamClose: stream found twice in its shared source's list"); - if (!c) { - CFRunLoopRemoveSource((CFRunLoopRef)CFArrayGetValueAtIndex(runLoopAndSourceKey, 0), stream->client->rlSource, (CFStringRef)CFArrayGetValueAtIndex(runLoopAndSourceKey, 1)); - CFRunLoopSourceInvalidate(stream->client->rlSource); + if (count == 0) { + CFRunLoopSourceRef source = _CFStreamCopySource(stream); + if (source) { + CFRunLoopRemoveSource((CFRunLoopRef)CFArrayGetValueAtIndex(runLoopAndSourceKey, 0), source, (CFStringRef)CFArrayGetValueAtIndex(runLoopAndSourceKey, 1)); + CFRelease(source); + } CFDictionaryRemoveValue(sSharedSources, runLoopAndSourceKey); } CFDictionaryRemoveValue(sSharedSources, stream); - CFRelease(stream->client->rlSource); - stream->client->rlSource = NULL; + _CFStreamSetSource(stream, NULL, count == 0); + __CFBitClear(stream->flags, SHARED_SOURCE); __CFSpinUnlock(&sSourceLock); } } +} + +__private_extern__ void _CFStreamClose(struct _CFStream *stream) { + CFStreamStatus status = _CFStreamGetStatus(stream); + const struct _CFStreamCallBacks *cb = _CFStreamGetCallBackPtr(stream); + if (status == kCFStreamStatusNotOpen || status == kCFStreamStatusClosed || (status == kCFStreamStatusError && __CFBitIsSet(stream->flags, HAVE_CLOSED))) { + // Stream is not open from the client's perspective; do not callout and do not update our status to "closed" + return; + } + __CFBitSet(stream->flags, HAVE_CLOSED); + __CFBitSet(stream->flags, CALLING_CLIENT); + if (cb->close) { + cb->close(stream, _CFStreamGetInfoPointer(stream)); + } + if (stream->client) { + _CFStreamDetachSource(stream); + } _CFStreamSetStatusCode(stream, kCFStreamStatusClosed); __CFBitClear(stream->flags, CALLING_CLIENT); } @@ -199,45 +285,7 @@ static void __CFStreamDeallocate(CFTypeRef cf) { if (cbContext->info && cbContext->release) { cbContext->release(cbContext->info); } - if (stream->client->rlSource) { - if (!__CFBitIsSet(stream->flags, SHARED_SOURCE)) { - CFRunLoopSourceInvalidate(stream->client->rlSource); - CFRelease(stream->client->rlSource); - stream->client->rlSource = NULL; - } - else { - - CFArrayRef runLoopAndSourceKey; - CFMutableArrayRef list; - CFIndex c, i; - - __CFSpinLock(&sSourceLock); - - runLoopAndSourceKey = (CFArrayRef)CFDictionaryGetValue(sSharedSources, stream); - list = (CFMutableArrayRef)CFDictionaryGetValue(sSharedSources, runLoopAndSourceKey); - - c = CFArrayGetCount(list); - i = CFArrayGetFirstIndexOfValue(list, CFRangeMake(0, c), stream); - if (i != kCFNotFound) { - CFArrayRemoveValueAtIndex(list, i); - c--; - } - - if (!c) { - CFRunLoopRemoveSource((CFRunLoopRef)CFArrayGetValueAtIndex(runLoopAndSourceKey, 0), stream->client->rlSource, (CFStringRef)CFArrayGetValueAtIndex(runLoopAndSourceKey, 1)); - CFRunLoopSourceInvalidate(stream->client->rlSource); - CFDictionaryRemoveValue(sSharedSources, runLoopAndSourceKey); - } - - CFDictionaryRemoveValue(sSharedSources, stream); - - CFRelease(stream->client->rlSource); - stream->client->rlSource = NULL; - __CFBitClear(stream->flags, SHARED_SOURCE); - - __CFSpinUnlock(&sSourceLock); - } - } + _CFStreamDetachSource(stream); if (stream->client->runLoopsAndModes) { CFRelease(stream->client->runLoopsAndModes); } @@ -262,6 +310,8 @@ static void __CFStreamDeallocate(CFTypeRef cf) { if (!__CFBitIsSet(stream->flags, CONSTANT_CALLBACKS)) { CFAllocatorDeallocate(alloc, (void *)stream->callBacks); } + if (stream->_reserved1) + _CFStreamDestroyReserved(alloc, stream->_reserved1); } static const CFRuntimeClass __CFReadStreamClass = { @@ -318,6 +368,8 @@ static struct _CFStream *_CFStreamCreate(CFAllocatorRef allocator, Boolean isRea newStream->client = NULL; newStream->info = NULL; newStream->callBacks = NULL; + + newStream->_reserved1 = _CFStreamCreateReserved(allocator); } return newStream; } @@ -524,6 +576,8 @@ static void _signalEventSync(struct _CFStream* stream, CFOptionFlags whatToSigna /* What happens if the callback sets the client to NULL? We're in a loop here... Hmm. */ /* After writing that comment, I see: CFReadStreamSetClient(..., NULL) unsafely releases info pointer immediately */ + /* Of note, when the stream callbacks are set to to NULL, we're re-initalized so as not to receive more events, so we + * should break pout of this loop */ } } @@ -590,8 +644,12 @@ static void _cfstream_shared_signalEventSync(void* info) for (; i < c; i++) { struct _CFStream* s = (struct _CFStream*)CFArrayGetValueAtIndex(list, i); if (s->client->whatToSignal) { - CFRunLoopSourceSignal(s->client->rlSource); - break; + CFRunLoopSourceRef source = _CFStreamCopySource(s); + if (source) { + CFRunLoopSourceSignal(source); + CFRelease(source); + } + break; } } @@ -684,31 +742,39 @@ __private_extern__ void _CFStreamSignalEvent(struct _CFStream *stream, CFStreamE } // Now signal any pertinent event - if (stream->client && stream->client->rlSource && (stream->client->when & event)) { - - Boolean signalNow = FALSE; + if (stream->client && (stream->client->when & event) != 0) { + CFRunLoopSourceRef source = _CFStreamCopySource(stream); + + if (source) { + Boolean signalNow = FALSE; - stream->client->whatToSignal |= event; + stream->client->whatToSignal |= event; - if (synchronousAllowed && !__CFBitIsSet(stream->flags, CALLING_CLIENT)) { + if (synchronousAllowed && !__CFBitIsSet(stream->flags, CALLING_CLIENT)) { - CFRunLoopRef rl = CFRunLoopGetCurrent(); - CFStringRef mode = CFRunLoopCopyCurrentMode(rl); + CFRunLoopRef rl = CFRunLoopGetCurrent(); + CFStringRef mode = CFRunLoopCopyCurrentMode(rl); - if (mode) { - if (CFRunLoopContainsSource(rl, stream->client->rlSource, mode)) - signalNow = TRUE; - CFRelease(mode); + if (mode) { + if (CFRunLoopContainsSource(rl, source, mode)) + signalNow = TRUE; + } + if (mode) + CFRelease(mode); } - } - if (signalNow) { - // Can call out safely right now - _cfstream_solo_signalEventSync(stream); - } else { - // Schedule for later delivery - CFRunLoopSourceSignal(stream->client->rlSource); - _wakeUpRunLoop(stream); + if (signalNow) { + // Can call out safely right now + _cfstream_solo_signalEventSync(stream); + } else { + // Schedule for later delivery + if (source) { + CFRunLoopSourceSignal(source); + } + _wakeUpRunLoop(stream); + } + + CFRelease(source); } } } @@ -1132,6 +1198,7 @@ static void _initializeClient(struct _CFStream *stream) { __private_extern__ Boolean _CFStreamSetClient(struct _CFStream *stream, CFOptionFlags streamEvents, void (*clientCB)(struct _CFStream *, CFStreamEventType, void *), CFStreamClientContext *clientCallBackContext) { Boolean removingClient = (streamEvents == kCFStreamEventNone || clientCB == NULL || clientCallBackContext == NULL); + if (removingClient) { clientCB = NULL; streamEvents = kCFStreamEventNone; @@ -1203,12 +1270,12 @@ CF_EXPORT void *_CFWriteStreamGetClient(CFWriteStreamRef writeStream) { __private_extern__ void _CFStreamScheduleWithRunLoop(struct _CFStream *stream, CFRunLoopRef runLoop, CFStringRef runLoopMode) { const struct _CFStreamCallBacks *cb = _CFStreamGetCallBackPtr(stream); - if (!stream->client) { + if (! stream->client) { _initializeClient(stream); if (!stream->client) return; // we don't support asynch. } - if (!stream->client->rlSource) { + if (! stream->client->rlSource) { /* No source, so we join the shared source group */ CFTypeRef a[] = { runLoop, runLoopMode }; @@ -1221,7 +1288,12 @@ __private_extern__ void _CFStreamScheduleWithRunLoop(struct _CFStream *stream, C CFMutableArrayRef listOfStreamsSharingASource = (CFMutableArrayRef)CFDictionaryGetValue(sSharedSources, runLoopAndSourceKey); if (listOfStreamsSharingASource) { - stream->client->rlSource = (CFRunLoopSourceRef)CFRetain(((struct _CFStream*)CFArrayGetValueAtIndex(listOfStreamsSharingASource, 0))->client->rlSource); + struct _CFStream* aStream = (struct _CFStream*) CFArrayGetValueAtIndex(listOfStreamsSharingASource, 0); + CFRunLoopSourceRef source = _CFStreamCopySource(aStream); + if (source) { + _CFStreamSetSource(stream, source, FALSE); + CFRelease(source); + } CFRetain(listOfStreamsSharingASource); } else { @@ -1229,10 +1301,10 @@ __private_extern__ void _CFStreamScheduleWithRunLoop(struct _CFStream *stream, C 0, NULL, CFRetain, - CFRelease, + CFRelease, (CFStringRef(*)(const void *))CFCopyDescription, - NULL, - NULL, + NULL, + NULL, NULL, NULL, (void(*)(void *))_cfstream_shared_signalEventSync @@ -1243,9 +1315,10 @@ __private_extern__ void _CFStreamScheduleWithRunLoop(struct _CFStream *stream, C ctxt.info = listOfStreamsSharingASource; - stream->client->rlSource = CFRunLoopSourceCreate(kCFAllocatorSystemDefault, 0, &ctxt); - - CFRunLoopAddSource(runLoop, stream->client->rlSource, runLoopMode); + CFRunLoopSourceRef source = CFRunLoopSourceCreate(kCFAllocatorSystemDefault, 0, &ctxt); + _CFStreamSetSource(stream, source, FALSE); + CFRunLoopAddSource(runLoop, source, runLoopMode); + CFRelease(source); } CFArrayAppendValue(listOfStreamsSharingASource, stream); @@ -1263,7 +1336,7 @@ __private_extern__ void _CFStreamScheduleWithRunLoop(struct _CFStream *stream, C CFArrayRef runLoopAndSourceKey; CFMutableArrayRef listOfStreamsSharingASource; - CFIndex c, i; + CFIndex count, i; CFAllocatorRef alloc = CFGetAllocator(stream); CFRunLoopSourceContext ctxt = { @@ -1272,8 +1345,8 @@ __private_extern__ void _CFStreamScheduleWithRunLoop(struct _CFStream *stream, C NULL, // Do not use CFRetain/CFRelease callbacks here; that will cause a retain loop NULL, // Do not use CFRetain/CFRelease callbacks here; that will cause a retain loop (CFStringRef(*)(const void *))CFCopyDescription, - NULL, - NULL, + NULL, + NULL, NULL, NULL, (void(*)(void *))_cfstream_solo_signalEventSync @@ -1284,36 +1357,45 @@ __private_extern__ void _CFStreamScheduleWithRunLoop(struct _CFStream *stream, C runLoopAndSourceKey = (CFArrayRef)CFRetain((CFTypeRef)CFDictionaryGetValue(sSharedSources, stream)); listOfStreamsSharingASource = (CFMutableArrayRef)CFDictionaryGetValue(sSharedSources, runLoopAndSourceKey); - c = CFArrayGetCount(listOfStreamsSharingASource); - i = CFArrayGetFirstIndexOfValue(listOfStreamsSharingASource, CFRangeMake(0, c), stream); + count = CFArrayGetCount(listOfStreamsSharingASource); + i = CFArrayGetFirstIndexOfValue(listOfStreamsSharingASource, CFRangeMake(0, count), stream); if (i != kCFNotFound) { CFArrayRemoveValueAtIndex(listOfStreamsSharingASource, i); - c--; + count--; } - if (!c) { - CFRunLoopRemoveSource((CFRunLoopRef)CFArrayGetValueAtIndex(runLoopAndSourceKey, 0), stream->client->rlSource, (CFStringRef)CFArrayGetValueAtIndex(runLoopAndSourceKey, 1)); - CFRunLoopSourceInvalidate(stream->client->rlSource); + if (count == 0) { + CFRunLoopSourceRef source = _CFStreamCopySource(stream); + if (source) { + CFRunLoopRemoveSource((CFRunLoopRef)CFArrayGetValueAtIndex(runLoopAndSourceKey, 0), source, (CFStringRef)CFArrayGetValueAtIndex(runLoopAndSourceKey, 1)); + CFRelease(source); + } CFDictionaryRemoveValue(sSharedSources, runLoopAndSourceKey); } CFDictionaryRemoveValue(sSharedSources, stream); - CFRelease(stream->client->rlSource); + _CFStreamSetSource(stream, NULL, count == 0); + __CFBitClear(stream->flags, SHARED_SOURCE); __CFSpinUnlock(&sSourceLock); - stream->client->rlSource = CFRunLoopSourceCreate(alloc, 0, &ctxt); - - CFRunLoopAddSource((CFRunLoopRef)CFArrayGetValueAtIndex(runLoopAndSourceKey, 0), stream->client->rlSource, (CFStringRef)CFArrayGetValueAtIndex(runLoopAndSourceKey, 1)); - + CFRunLoopSourceRef source = CFRunLoopSourceCreate(alloc, 0, &ctxt); + _CFStreamSetSource(stream, source, FALSE); + CFRunLoopAddSource((CFRunLoopRef)CFArrayGetValueAtIndex(runLoopAndSourceKey, 0), source, (CFStringRef)CFArrayGetValueAtIndex(runLoopAndSourceKey, 1)); CFRelease(runLoopAndSourceKey); - CFRunLoopAddSource(runLoop, stream->client->rlSource, runLoopMode); + CFRunLoopAddSource(runLoop, source, runLoopMode); + + CFRelease(source); } else { /* We're not sharing, so just add the source to the rl & mode */ - CFRunLoopAddSource(runLoop, stream->client->rlSource, runLoopMode); + CFRunLoopSourceRef source = _CFStreamCopySource(stream); + if (source) { + CFRunLoopAddSource(runLoop, source, runLoopMode); + CFRelease(source); + } } if (!stream->client->runLoopsAndModes) { @@ -1331,9 +1413,13 @@ __private_extern__ void _CFStreamScheduleWithRunLoop(struct _CFStream *stream, C /* * If we've got events pending, we need to wake up and signal */ - if (stream->client->whatToSignal != 0) { - CFRunLoopSourceSignal(stream->client->rlSource); - _wakeUpRunLoop(stream); + if (stream->client && stream->client->whatToSignal != 0) { + CFRunLoopSourceRef source = _CFStreamCopySource(stream); + if (source) { + CFRunLoopSourceSignal(source); + CFRelease(source); + _wakeUpRunLoop(stream); + } } } @@ -1354,34 +1440,41 @@ __private_extern__ void _CFStreamUnscheduleFromRunLoop(struct _CFStream *stream, if (!stream->client->rlSource) return; if (!__CFBitIsSet(stream->flags, SHARED_SOURCE)) { - CFRunLoopRemoveSource(runLoop, stream->client->rlSource, runLoopMode); + CFRunLoopSourceRef source = _CFStreamCopySource(stream); + if (source) { + CFRunLoopRemoveSource(runLoop, source, runLoopMode); + CFRelease(source); + } } else { CFArrayRef runLoopAndSourceKey; CFMutableArrayRef list; - CFIndex c, i; + CFIndex count, i; __CFSpinLock(&sSourceLock); runLoopAndSourceKey = (CFArrayRef)CFDictionaryGetValue(sSharedSources, stream); list = (CFMutableArrayRef)CFDictionaryGetValue(sSharedSources, runLoopAndSourceKey); - c = CFArrayGetCount(list); - i = CFArrayGetFirstIndexOfValue(list, CFRangeMake(0, c), stream); + count = CFArrayGetCount(list); + i = CFArrayGetFirstIndexOfValue(list, CFRangeMake(0, count), stream); if (i != kCFNotFound) { CFArrayRemoveValueAtIndex(list, i); - c--; + count--; } - if (!c) { - CFRunLoopRemoveSource(runLoop, stream->client->rlSource, runLoopMode); - CFRunLoopSourceInvalidate(stream->client->rlSource); + if (count == 0) { + CFRunLoopSourceRef source = _CFStreamCopySource(stream); + if (source) { + CFRunLoopRemoveSource(runLoop, source, runLoopMode); + CFRelease(source); + } CFDictionaryRemoveValue(sSharedSources, runLoopAndSourceKey); } CFDictionaryRemoveValue(sSharedSources, stream); - CFRelease(stream->client->rlSource); - stream->client->rlSource = NULL; + _CFStreamSetSource(stream, NULL, count == 0); + __CFBitClear(stream->flags, SHARED_SOURCE); __CFSpinUnlock(&sSourceLock); diff --git a/CFStream.h b/CFStream.h index 885c9bb..e22f496 100644 --- a/CFStream.h +++ b/CFStream.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFStreamAbstract.h b/CFStreamAbstract.h index 0b00af2..bf12c92 100644 --- a/CFStreamAbstract.h +++ b/CFStreamAbstract.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFStreamInternal.h b/CFStreamInternal.h index 01949e5..e657b26 100644 --- a/CFStreamInternal.h +++ b/CFStreamInternal.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFStreamPriv.h b/CFStreamPriv.h index 37e29f1..b7827ca 100644 --- a/CFStreamPriv.h +++ b/CFStreamPriv.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFString.c b/CFString.c index 57e0563..69c9db7 100644 --- a/CFString.c +++ b/CFString.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFString.h b/CFString.h index ba0364f..99333cb 100644 --- a/CFString.h +++ b/CFString.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFStringDefaultEncoding.h b/CFStringDefaultEncoding.h index 4a49285..439b23a 100644 --- a/CFStringDefaultEncoding.h +++ b/CFStringDefaultEncoding.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFStringEncodingConverter.c b/CFStringEncodingConverter.c index 1f2ef4e..094ba57 100644 --- a/CFStringEncodingConverter.c +++ b/CFStringEncodingConverter.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFStringEncodingConverter.h b/CFStringEncodingConverter.h index 31d09ef..d1372a0 100644 --- a/CFStringEncodingConverter.h +++ b/CFStringEncodingConverter.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFStringEncodingConverterExt.h b/CFStringEncodingConverterExt.h index 60111b3..a4b6492 100644 --- a/CFStringEncodingConverterExt.h +++ b/CFStringEncodingConverterExt.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFStringEncodingConverterPriv.h b/CFStringEncodingConverterPriv.h index 7f36fee..33fa73e 100644 --- a/CFStringEncodingConverterPriv.h +++ b/CFStringEncodingConverterPriv.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFStringEncodingDatabase.c b/CFStringEncodingDatabase.c index ce578ba..d3e8021 100644 --- a/CFStringEncodingDatabase.c +++ b/CFStringEncodingDatabase.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFStringEncodingDatabase.h b/CFStringEncodingDatabase.h index 195aa95..e982afe 100644 --- a/CFStringEncodingDatabase.h +++ b/CFStringEncodingDatabase.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFStringEncodingExt.h b/CFStringEncodingExt.h index 06155fb..e1e223e 100644 --- a/CFStringEncodingExt.h +++ b/CFStringEncodingExt.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFStringEncodings.c b/CFStringEncodings.c index 4f41603..6807c11 100644 --- a/CFStringEncodings.c +++ b/CFStringEncodings.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFStringScanner.c b/CFStringScanner.c index de2191c..4de445c 100644 --- a/CFStringScanner.c +++ b/CFStringScanner.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFStringUtilities.c b/CFStringUtilities.c index 4300f67..3744aa3 100644 --- a/CFStringUtilities.c +++ b/CFStringUtilities.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFSystemDirectories.c b/CFSystemDirectories.c index 415f1bc..10cfdbd 100644 --- a/CFSystemDirectories.c +++ b/CFSystemDirectories.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFTimeZone.c b/CFTimeZone.c index fae899c..d976564 100644 --- a/CFTimeZone.c +++ b/CFTimeZone.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFTimeZone.h b/CFTimeZone.h index 8d34b51..824b1ea 100644 --- a/CFTimeZone.h +++ b/CFTimeZone.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFTree.c b/CFTree.c index 2074ddb..ee37e29 100644 --- a/CFTree.c +++ b/CFTree.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFTree.h b/CFTree.h index ad649ad..2b55e03 100644 --- a/CFTree.h +++ b/CFTree.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFURL.c b/CFURL.c index 1a87757..fb6ec7c 100644 --- a/CFURL.c +++ b/CFURL.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFURL.h b/CFURL.h index 80bbc27..6195043 100644 --- a/CFURL.h +++ b/CFURL.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFURLAccess.c b/CFURLAccess.c index 16af3b4..b79777e 100644 --- a/CFURLAccess.c +++ b/CFURLAccess.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFURLAccess.h b/CFURLAccess.h index 96e2353..14b7ef1 100644 --- a/CFURLAccess.h +++ b/CFURLAccess.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFUUID.c b/CFUUID.c index be21b79..937ff15 100644 --- a/CFUUID.c +++ b/CFUUID.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFUUID.h b/CFUUID.h index 823082a..7b000e9 100644 --- a/CFUUID.h +++ b/CFUUID.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFUniChar.c b/CFUniChar.c index 31bb5fe..10a00bf 100644 --- a/CFUniChar.c +++ b/CFUniChar.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFUniChar.h b/CFUniChar.h index e3df963..ddb0230 100644 --- a/CFUniChar.h +++ b/CFUniChar.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFUniCharPriv.h b/CFUniCharPriv.h index 6563aef..784d528 100644 --- a/CFUniCharPriv.h +++ b/CFUniCharPriv.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFUnicodeDecomposition.c b/CFUnicodeDecomposition.c index 3a293ca..adade11 100644 --- a/CFUnicodeDecomposition.c +++ b/CFUnicodeDecomposition.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFUnicodeDecomposition.h b/CFUnicodeDecomposition.h index a134877..f6d9690 100644 --- a/CFUnicodeDecomposition.h +++ b/CFUnicodeDecomposition.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFUnicodePrecomposition.c b/CFUnicodePrecomposition.c index 4b18ef4..da37677 100644 --- a/CFUnicodePrecomposition.c +++ b/CFUnicodePrecomposition.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFUnicodePrecomposition.h b/CFUnicodePrecomposition.h index ef41758..7e3877a 100644 --- a/CFUnicodePrecomposition.h +++ b/CFUnicodePrecomposition.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFUserNotification.c b/CFUserNotification.c index e9b6c31..901373c 100644 --- a/CFUserNotification.c +++ b/CFUserNotification.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFUserNotification.h b/CFUserNotification.h index 82d9774..bc2fd0f 100644 --- a/CFUserNotification.h +++ b/CFUserNotification.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFUtilities.c b/CFUtilities.c index c053613..f999bca 100644 --- a/CFUtilities.c +++ b/CFUtilities.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFVersion.c b/CFVersion.c index e470448..2ac3607 100644 --- a/CFVersion.c +++ b/CFVersion.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * @@ -25,5 +25,5 @@ Copyright 2009, Apple Inc. All rights reserved. Responsibility: CFLite Team */ -const unsigned char kCFCoreFoundationVersionString[] = "@(#)PROGRAM:CoreFoundation PROJECT:CoreFoundation-550.13 SYSTEM:Darwin DEVELOPER:unknown BUILT:" __DATE__ " " __TIME__ "\n"; -double kCFCoreFoundationVersionNumber = (double)550.13; +const unsigned char kCFCoreFoundationVersionString[] = "@(#)PROGRAM:CoreFoundation PROJECT:CoreFoundation-550.19 SYSTEM:Darwin DEVELOPER:unknown BUILT:" __DATE__ " " __TIME__ "\n"; +double kCFCoreFoundationVersionNumber = (double)550.19; diff --git a/CFXMLInputStream.c b/CFXMLInputStream.c index 5ce7e72..ef7a0c3 100644 --- a/CFXMLInputStream.c +++ b/CFXMLInputStream.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFXMLInputStream.h b/CFXMLInputStream.h index 187b76a..1e3d8fe 100644 --- a/CFXMLInputStream.h +++ b/CFXMLInputStream.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFXMLNode.c b/CFXMLNode.c index 9665929..8c04fd7 100644 --- a/CFXMLNode.c +++ b/CFXMLNode.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFXMLNode.h b/CFXMLNode.h index 8ff2ad0..df3f340 100644 --- a/CFXMLNode.h +++ b/CFXMLNode.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFXMLParser.c b/CFXMLParser.c index f7b44b5..4153ad4 100644 --- a/CFXMLParser.c +++ b/CFXMLParser.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFXMLParser.h b/CFXMLParser.h index 73d655e..1dc19d0 100644 --- a/CFXMLParser.h +++ b/CFXMLParser.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFXMLPreferencesDomain.c b/CFXMLPreferencesDomain.c index a3c1a01..cca7871 100644 --- a/CFXMLPreferencesDomain.c +++ b/CFXMLPreferencesDomain.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFXMLTree.c b/CFXMLTree.c index deb74fb..819a254 100644 --- a/CFXMLTree.c +++ b/CFXMLTree.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CoreFoundation.h b/CoreFoundation.h index 0449f0f..0ce50e1 100644 --- a/CoreFoundation.h +++ b/CoreFoundation.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CoreFoundation_Prefix.h b/CoreFoundation_Prefix.h index 9018049..b734a38 100644 --- a/CoreFoundation_Prefix.h +++ b/CoreFoundation_Prefix.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/ForFoundationOnly.h b/ForFoundationOnly.h index 028cca1..263a9af 100644 --- a/ForFoundationOnly.h +++ b/ForFoundationOnly.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2010 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/Info.plist b/Info.plist index ab02c73..3236f7d 100644 --- a/Info.plist +++ b/Info.plist @@ -19,7 +19,7 @@ CFBundleSignature ???? CFBundleVersion - 550.13 + 550.19 CarbonLazyValues CodeFragmentManager -- 2.47.2