Skip to content

Commit 0b97102

Browse files
spevansspevans
committed
Upgrade xcode project to latest Recommended Settings
- This enables more clang warnings which finds some issues in the CoreFoundation code. Fix some of these.
1 parent f34b11f commit 0b97102

File tree

7 files changed

+29
-11
lines changed

7 files changed

+29
-11
lines changed

‎CoreFoundation/Base.subproj/ForFoundationOnly.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ typedef struct {
110110
CFTypeRef _Null_unspecified (*_Null_unspecified fetchValue)(CFTypeRef context, void *domain, CFStringRef key); // Caller releases
111111
void (*_Null_unspecified writeValue)(CFTypeRef context, void *domain, CFStringRef key, CFTypeRef value);
112112
Boolean (*_Null_unspecified synchronize)(CFTypeRef context, void *domain);
113-
void (*_Null_unspecified getKeysAndValues)(CFAllocatorRef _Nullable alloc, CFTypeRef context, void *domain, void *_Null_unspecified * _Null_unspecified buf[], CFIndex *numKeyValuePairs);
113+
void (*_Null_unspecified getKeysAndValues)(CFAllocatorRef _Nullable alloc, CFTypeRef context, void *domain, void *_Null_unspecified * _Null_unspecified buf[_Nullable], CFIndex *numKeyValuePairs);
114114
CFDictionaryRef _Null_unspecified (*_Null_unspecified copyDomainDictionary)(CFTypeRef context, void *domain);
115115
/* HACK - see comment on _CFPreferencesDomainSetIsWorldReadable(), below */
116116
void (*setIsWorldReadable)(CFTypeRef context, void *domain, Boolean isWorldReadable);

‎CoreFoundation/RunLoop.subproj/CFMessagePort.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ static CFMessagePortRef __CFMessagePortCreateRemote(CFAllocatorRef allocator, CF
443443
CFMachPortContext ctx;
444444
uint8_t *utfname = NULL;
445445
CFIndex size;
446-
mach_port_t bp, port;
446+
mach_port_t bp;
447447
kern_return_t ret;
448448

449449
name = __CFMessagePortSanitizeStringName(name, &utfname, NULL);
@@ -496,8 +496,8 @@ static CFMessagePortRef __CFMessagePortCreateRemote(CFAllocatorRef allocator, CF
496496
ctx.retain = NULL;
497497
ctx.release = NULL;
498498
ctx.copyDescription = NULL;
499-
task_get_bootstrap_port(mach_task_self(), &bp);
500-
native = (KERN_SUCCESS == ret) ? CFMachPortCreateWithPort(allocator, port, __CFMessagePortDummyCallback, &ctx, NULL) : NULL;
499+
ret = task_get_bootstrap_port(mach_task_self(), &bp);
500+
native = (KERN_SUCCESS == ret) ? CFMachPortCreateWithPort(allocator, bp, __CFMessagePortDummyCallback, &ctx, NULL) : NULL;
501501
CFAllocatorDeallocate(kCFAllocatorSystemDefault, utfname);
502502
if (NULL == native) {
503503
// name is released by deallocation

‎Foundation.xcodeproj/project.pbxproj

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2028,7 +2028,7 @@
20282028
isa = PBXProject;
20292029
attributes = {
20302030
LastSwiftUpdateCheck = 0830;
2031-
LastUpgradeCheck = 0830;
2031+
LastUpgradeCheck = 0900;
20322032
ORGANIZATIONNAME = Apple;
20332033
TargetAttributes = {
20342034
5B5D885C1BBC938800234F36 = {
@@ -2501,14 +2501,20 @@
25012501
CLANG_CXX_LIBRARY = "libc++";
25022502
CLANG_LINK_OBJC_RUNTIME = NO;
25032503
CLANG_MODULES_AUTOLINK = NO;
2504+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
25042505
CLANG_WARN_BOOL_CONVERSION = YES;
2506+
CLANG_WARN_COMMA = YES;
25052507
CLANG_WARN_CONSTANT_CONVERSION = YES;
25062508
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
25072509
CLANG_WARN_EMPTY_BODY = YES;
25082510
CLANG_WARN_ENUM_CONVERSION = YES;
25092511
CLANG_WARN_INFINITE_RECURSION = YES;
25102512
CLANG_WARN_INT_CONVERSION = YES;
2513+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
2514+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
25112515
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
2516+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
2517+
CLANG_WARN_STRICT_PROTOTYPES = YES;
25122518
CLANG_WARN_SUSPICIOUS_MOVE = YES;
25132519
CLANG_WARN_UNREACHABLE_CODE = YES;
25142520
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -2550,14 +2556,20 @@
25502556
CLANG_CXX_LIBRARY = "libc++";
25512557
CLANG_LINK_OBJC_RUNTIME = NO;
25522558
CLANG_MODULES_AUTOLINK = NO;
2559+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
25532560
CLANG_WARN_BOOL_CONVERSION = YES;
2561+
CLANG_WARN_COMMA = YES;
25542562
CLANG_WARN_CONSTANT_CONVERSION = YES;
25552563
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
25562564
CLANG_WARN_EMPTY_BODY = YES;
25572565
CLANG_WARN_ENUM_CONVERSION = YES;
25582566
CLANG_WARN_INFINITE_RECURSION = YES;
25592567
CLANG_WARN_INT_CONVERSION = YES;
2568+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
2569+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
25602570
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
2571+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
2572+
CLANG_WARN_STRICT_PROTOTYPES = YES;
25612573
CLANG_WARN_SUSPICIOUS_MOVE = YES;
25622574
CLANG_WARN_UNREACHABLE_CODE = YES;
25632575
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -2763,7 +2775,6 @@
27632775
"-DCF_CHARACTERSET_UNICODE_DATA_B=\\\\\"CoreFoundation/CharacterSets/CFUnicodeData-B.mapping\\\\\"",
27642776
"-DCF_CHARACTERSET_UNICHAR_DB=\\\\\"CoreFoundation/CharacterSets/CFUniCharPropertyDatabase.data\\\\\"",
27652777
"-DCF_CHARACTERSET_BITMAP=\\\\\"CoreFoundation/CharacterSets/CFCharacterSetBitmaps.bitmap\\\\\"",
2766-
"-Wno-nullability-completeness-on-arrays",
27672778
"-Wno-format-security",
27682779
);
27692780
PRIVATE_HEADERS_FOLDER_PATH = /usr/local/include/CoreFoundation;
@@ -2805,7 +2816,6 @@
28052816
"-DCF_CHARACTERSET_UNICODE_DATA_B=\\\\\"CoreFoundation/CharacterSets/CFUnicodeData-B.mapping\\\\\"",
28062817
"-DCF_CHARACTERSET_UNICHAR_DB=\\\\\"CoreFoundation/CharacterSets/CFUniCharPropertyDatabase.data\\\\\"",
28072818
"-DCF_CHARACTERSET_BITMAP=\\\\\"CoreFoundation/CharacterSets/CFCharacterSetBitmaps.bitmap\\\\\"",
2808-
"-Wno-nullability-completeness-on-arrays",
28092819
"-Wno-format-security",
28102820
);
28112821
PRIVATE_HEADERS_FOLDER_PATH = /usr/local/include/CoreFoundation;

‎Foundation.xcodeproj/xcshareddata/xcschemes/CoreFoundation.xcscheme

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0830"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "NO"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
</Testables>
@@ -36,6 +37,7 @@
3637
buildConfiguration = "Debug"
3738
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
3839
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
40+
language = ""
3941
launchStyle = "0"
4042
useCustomWorkingDirectory = "NO"
4143
ignoresPersistentStateOnLaunch = "NO"

‎Foundation.xcodeproj/xcshareddata/xcschemes/SwiftFoundation.xcscheme

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0830"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "NO"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
</Testables>
@@ -36,6 +37,7 @@
3637
buildConfiguration = "Debug"
3738
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
3839
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
40+
language = ""
3941
launchStyle = "0"
4042
useCustomWorkingDirectory = "NO"
4143
ignoresPersistentStateOnLaunch = "NO"

‎Foundation.xcodeproj/xcshareddata/xcschemes/TestFoundation.xcscheme

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0830"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "NO"
@@ -68,6 +68,7 @@
6868
buildConfiguration = "Debug"
6969
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
7070
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
71+
language = ""
7172
shouldUseLaunchSchemeArgsEnv = "YES">
7273
<Testables>
7374
</Testables>
@@ -87,6 +88,7 @@
8788
buildConfiguration = "Debug"
8889
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
8990
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
91+
language = ""
9092
launchStyle = "0"
9193
useCustomWorkingDirectory = "NO"
9294
ignoresPersistentStateOnLaunch = "NO"

‎Foundation.xcodeproj/xcshareddata/xcschemes/plutil.xcscheme

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0830"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "NO"
@@ -40,6 +40,7 @@
4040
buildConfiguration = "Debug"
4141
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4242
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
43+
language = ""
4344
shouldUseLaunchSchemeArgsEnv = "YES">
4445
<Testables>
4546
</Testables>
@@ -59,6 +60,7 @@
5960
buildConfiguration = "Debug"
6061
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
6162
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
63+
language = ""
6264
launchStyle = "0"
6365
useCustomWorkingDirectory = "NO"
6466
ignoresPersistentStateOnLaunch = "NO"

0 commit comments

Comments
 (0)