Fix various typos (#5290)

Author: Coeur

CMakeLists.txt

@@ -115,7 +115,7 @@ include(CheckSymbolExists)
 check_linker_flag(C "LINKER:--build-id=sha1" LINKER_SUPPORTS_BUILD_ID)
 
 # Detect if the system libc defines symbols for these functions.
-# If it is not availble, swift-corelibs-foundation has its own implementations
+# If it is not available, swift-corelibs-foundation has its own implementations
 # that will be used. If it is available, it should not redefine them.
 # Note: SwiftPM does not have the ability to introspect the contents of the SDK
 #       and therefore will always include these functions in the build and will

Sources/CoreFoundation/BlockRuntime/runtime.c

@@ -374,7 +374,7 @@ static void *_Block_copy_internal(const void *arg, const bool wantsOne) {
         return aBlock;
     }
 
-    // Its a stack block.  Make a copy.
+    // It's a stack block.  Make a copy.
     if (!isGC) {
         struct Block_layout *result = malloc(aBlock->descriptor->size);
         if (!result) return NULL;
@@ -433,7 +433,7 @@ static void _Block_byref_assign_copy(void *dest, const void *arg, const int flag
     else if ((src->forwarding->flags & BLOCK_REFCOUNT_MASK) == 0) {
         // src points to stack
         bool isWeak = ((flags & (BLOCK_FIELD_IS_BYREF|BLOCK_FIELD_IS_WEAK)) == (BLOCK_FIELD_IS_BYREF|BLOCK_FIELD_IS_WEAK));
-        // if its weak ask for an object (only matters under GC)
+        // if it's weak ask for an object (only matters under GC)
         struct Block_byref *copy = (struct Block_byref *)_Block_allocator(src->size, false, isWeak);
         copy->flags = src->flags | _Byref_flag_initial_value; // non-GC one for caller, one for stack
         copy->forwarding = copy; // patch heap copy to point to itself (skip write-barrier)

Sources/CoreFoundation/CFBase.c

@@ -470,7 +470,7 @@ CFAllocatorRef CFAllocatorGetDefault(void) {
 
 void CFAllocatorSetDefault(CFAllocatorRef allocator) {
 #ifndef __clang_analyzer__
-    // clang doesn't like complexity of staticly laid out instances like the black magic we do here and  __CFGetDefaultAllocator
+    // clang doesn't like complexity of statically laid out instances like the black magic we do here and __CFGetDefaultAllocator
     CFAllocatorRef current = __CFGetDefaultAllocator();
 #if defined(DEBUG) 
     if (NULL != allocator) {

Sources/CoreFoundation/CFBundle_Binary.c

@@ -123,7 +123,7 @@ static char *_cleanedPathForPath(const char *curName) {
 }
 
 CF_PRIVATE CFArrayRef _CFBundleDYLDCopyLoadedImagePathsIfChanged(void) {
-    // This returns an array of the paths of all the dyld images in the process.  These paths may not be absolute, they may point at things that are not bundles, they may be staticly linked bundles or dynamically loaded bundles, they may be NULL.
+    // This returns an array of the paths of all the dyld images in the process.  These paths may not be absolute, they may point at things that are not bundles, they may be statically linked bundles or dynamically loaded bundles, they may be NULL.
     uint32_t i, numImages = _dyld_image_count();
     CFMutableArrayRef result = NULL;
     static uint32_t _cachedDYLDImageCount = -1;
@@ -442,7 +442,7 @@ static void *_CFBundleDYLDGetSymbolByNameWithSearch(CFBundleRef bundle, CFString
                 if (!CFStringGetCString(executableName, hintBuff, 1024, kCFStringEncodingUTF8)) hintBuff[0] = '\0';
                 CFRelease(executableName);
             }
-            // Nowdays, NSIsSymbolNameDefinedWithHint() and NSLookupAndBindSymbolWithHint()
+            // Nowadays, NSIsSymbolNameDefinedWithHint() and NSLookupAndBindSymbolWithHint()
             // are identical, except the first just returns a bool, so checking with the
             // Is function first just causes a redundant lookup.
             // This returns NULL on failure.

Sources/CoreFoundation/CFCalendar.c

@@ -156,7 +156,7 @@ static void __CFCalendarSetToFirstInstant(CFCalendarRef calendar, CFCalendarUnit
             __cficu_ucal_set(calendar->_cal, UCAL_YEAR, __cficu_ucal_getLimit(calendar->_cal, UCAL_YEAR, UCAL_ACTUAL_MINIMUM, &status));
         case kCFCalendarUnitYear:
             __cficu_ucal_set(calendar->_cal, UCAL_MONTH, __cficu_ucal_getLimit(calendar->_cal, UCAL_MONTH, UCAL_ACTUAL_MINIMUM, &status));
-            // #warning if there is a lunar leap month of the same number *preceeding* month N,
+            // #warning if there is a lunar leap month of the same number *preceding* month N,
             // then we should set the calendar to the leap month, not the regular month.
             __cficu_ucal_set(calendar->_cal, UCAL_IS_LEAP_MONTH, 0);
         case kCFCalendarUnitMonth:

Sources/CoreFoundation/CFCharacterSet.c

@@ -1360,13 +1360,13 @@ const CFRuntimeClass __CFCharacterSetClass = {
     __CFCharacterSetCopyDescription
 };
 
-static bool __CFCheckForExapendedSet = false;
+static bool __CFDebugExpandedSet = false;
 
 CF_PRIVATE void __CFCharacterSetInitialize(void) {
     static dispatch_once_t initOnce;
     dispatch_once(&initOnce, ^{
         const char *checkForExpandedSet = getenv("__CF_DEBUG_EXPANDED_SET");
-        if (checkForExpandedSet && (*checkForExpandedSet == 'Y')) __CFCheckForExapendedSet = true;
+        if (checkForExpandedSet && (*checkForExpandedSet == 'Y')) __CFDebugExpandedSet = true;
     });
 }
 
@@ -1378,7 +1378,7 @@ CFTypeID CFCharacterSetGetTypeID(void) {
 }
 
 /*** CharacterSet creation ***/
-/* Functions to create basic immutable characterset.
+/* Functions to create basic immutable character set.
 */
 CFCharacterSetRef CFCharacterSetGetPredefined(CFCharacterSetPredefinedSet theSetIdentifier) {
     CFCharacterSetRef cset;
@@ -2362,7 +2362,7 @@ void CFCharacterSetAddCharactersInRange(CFMutableCharacterSetRef theSet, CFRange
     }
     __CFCSetPutHasHashValue(theSet, false);
 
-    if (__CFCheckForExapendedSet) __CFCheckForExpandedSet(theSet);
+    if (__CFDebugExpandedSet) __CFCheckForExpandedSet(theSet);
 }
 
 void CFCharacterSetRemoveCharactersInRange(CFMutableCharacterSetRef theSet, CFRange theRange) {
@@ -2436,7 +2436,7 @@ void CFCharacterSetRemoveCharactersInRange(CFMutableCharacterSetRef theSet, CFRa
     }
 
     __CFCSetPutHasHashValue(theSet, false);
-    if (__CFCheckForExapendedSet) __CFCheckForExpandedSet(theSet);
+    if (__CFDebugExpandedSet) __CFCheckForExpandedSet(theSet);
 }
 
 void CFCharacterSetAddCharactersInString(CFMutableCharacterSetRef theSet,  CFStringRef theString) {
@@ -2527,7 +2527,7 @@ void CFCharacterSetAddCharactersInString(CFMutableCharacterSetRef theSet,  CFStr
 
     __CFCSetPutHasHashValue(theSet, false);
 
-    if (__CFCheckForExapendedSet) __CFCheckForExpandedSet(theSet);
+    if (__CFDebugExpandedSet) __CFCheckForExpandedSet(theSet);
 
     if (hasSurrogate) __CFApplySurrogatesInString(theSet, theString, &CFCharacterSetAddCharactersInRange);
 }
@@ -2614,7 +2614,7 @@ void CFCharacterSetRemoveCharactersInString(CFMutableCharacterSetRef theSet, CFS
     }
 
     __CFCSetPutHasHashValue(theSet, false);
-    if (__CFCheckForExapendedSet) __CFCheckForExpandedSet(theSet);
+    if (__CFDebugExpandedSet) __CFCheckForExpandedSet(theSet);
 
     if (hasSurrogate) __CFApplySurrogatesInString(theSet, theString, &CFCharacterSetRemoveCharactersInRange);
 }
@@ -2740,7 +2740,7 @@ void CFCharacterSetUnion(CFMutableCharacterSetRef theSet, CFCharacterSetRef theO
                 }
             }
         }
-        if (__CFCheckForExapendedSet) __CFCheckForExpandedSet(theSet);
+        if (__CFDebugExpandedSet) __CFCheckForExpandedSet(theSet);
     } else { // It's NSCharacterSet
         CFDataRef bitmapRep = CFCharacterSetCreateBitmapRepresentation(kCFAllocatorSystemDefault, theOtherSet);
         const UInt32 *bitmap2 = (bitmapRep && CFDataGetLength(bitmapRep) ? (const UInt32 *)CFDataGetBytePtr(bitmapRep) : NULL);
@@ -2984,7 +2984,7 @@ void CFCharacterSetIntersect(CFMutableCharacterSetRef theSet, CFCharacterSetRef
                 __CFCSetDeallocateAnnexPlane(theSet);
             }
         }
-        if (__CFCheckForExapendedSet) __CFCheckForExpandedSet(theSet);
+        if (__CFDebugExpandedSet) __CFCheckForExpandedSet(theSet);
     } else { // It's NSCharacterSet
         CFDataRef bitmapRep = CFCharacterSetCreateBitmapRepresentation(kCFAllocatorSystemDefault, theOtherSet);
         const UInt32 *bitmap2 = (bitmapRep && CFDataGetLength(bitmapRep) ? (const UInt32 *)CFDataGetBytePtr(bitmapRep) : NULL);

Sources/CoreFoundation/CFDateFormatter.c

@@ -955,7 +955,7 @@ static CFMutableStringRef __createISO8601FormatString(CFISO8601DateFormatOptions
                     } else {
                         CFStringAppendCString(resultStr, "HH:mm:ss", kCFStringEncodingUTF8);
                     }
-                    // Add support for fracional seconds
+                    // Add support for fractional seconds
                     if (includeFractionalSecs) {
                         CFStringAppendCString(resultStr, ".SSS", kCFStringEncodingUTF8);
                     }

Sources/CoreFoundation/CFICUConverters.c

@@ -263,7 +263,7 @@ CF_PRIVATE CFIndex __CFStringEncodingICUToBytes(const char *icuName, uint32_t fl
         ucnv_fromUnicode(converter, &destination, destinationLimit, (const UChar **)&source, (const UChar *)sourceLimit, NULL, flush, &errorCode);
 
 #if HAS_ICU_BUG_6024743
-/* Another critical ICU design issue. Similar to conversion error, source pointer returned from U_BUFFER_OVERFLOW_ERROR is already beyond the last valid character position. It renders the returned value from source entirely unusable. We have to manually back up until succeeding <rdar://problem/7183045> Interestingly, this issue doesn't apply to ucnv_toUnicode. The asynmmetric nature makes this more dangerous */
+/* Another critical ICU design issue. Similar to conversion error, source pointer returned from U_BUFFER_OVERFLOW_ERROR is already beyond the last valid character position. It renders the returned value from source entirely unusable. We have to manually back up until succeeding <rdar://problem/7183045> Interestingly, this issue doesn't apply to ucnv_toUnicode. The asymmetric nature makes this more dangerous */
         if (U_BUFFER_OVERFLOW_ERROR == errorCode) {
             const uint8_t *bitmap = CFUniCharGetBitmapPtrForPlane(kCFUniCharNonBaseCharacterSet, 0);
             const uint8_t *nonBase;

Sources/CoreFoundation/CFLocaleIdentifier.c

@@ -2195,9 +2195,9 @@ CFStringRef CFLocaleCreateLocaleIdentifierFromComponents(CFAllocatorRef allocato
                 CFCalendarRef cal = (CFCalendarRef)values[idx];
                 CFStringRef ident = CFCalendarGetIdentifier(cal);
                 value = __CStringFromString(ident);
-                char *oldkey = key;
+                char *oldKey = key;
                 key = strdup("calendar");
-                free(oldkey);
+                free(oldKey);
             } else {
                 value = __CStringFromString(values[idx]);
             }

Sources/CoreFoundation/CFOldStylePList.c

@@ -86,7 +86,7 @@ static Boolean advanceToNonSpace(_CFStringsFileParseInfo *pInfo) {
         if (ch2 == ' ' || ch2 == 0x2028 || ch2 == 0x2029) continue;	// space and Unicode line sep, para sep
         if (ch2 == '/') {
             if (pInfo->curr >= pInfo->end) {
-                // TODO: this could possibly be made more robust (imagine if pInfo->curr is stomped; pInfo->end - 1 might be safer.  Unless its smashed too :-/
+                // TODO: this could possibly be made more robust (imagine if pInfo->curr is stomped; pInfo->end - 1 might be safer.  Unless it's smashed too :-/
                 // whoops; back up and return
                 pInfo->curr --;
                 return true;