From 628b1c16d22b9dc45c9b634309b5015c2c58c69a Mon Sep 17 00:00:00 2001 From: pi1024e Date: Wed, 31 Jul 2019 10:56:25 -0400 Subject: [PATCH 01/14] Made methods in CFSocketStream consistent in style --- CoreFoundation/Stream.subproj/CFSocketStream.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/CoreFoundation/Stream.subproj/CFSocketStream.c b/CoreFoundation/Stream.subproj/CFSocketStream.c index 0c8e02eb53..58ae6ac663 100644 --- a/CoreFoundation/Stream.subproj/CFSocketStream.c +++ b/CoreFoundation/Stream.subproj/CFSocketStream.c @@ -220,19 +220,20 @@ CF_PRIVATE CFStreamError _CFStreamErrorFromError(CFErrorRef error) { CF_PRIVATE CFErrorRef _CFErrorFromStreamError(CFAllocatorRef alloc, CFStreamError *streamError) { CFErrorRef result; Boolean canUpCall; - + __CFLock(&(CFNetworkSupport.lock)); if (!__CFBitIsSet(CFNetworkSupport.flags, kTriedToLoad)) initializeCFNetworkSupport(); canUpCall = (CFNetworkSupport._CFErrorCreateWithStreamError != NULL); __CFUnlock(&(CFNetworkSupport.lock)); + if (canUpCall) { result = CFNETWORK_CALL(_CFErrorCreateWithStreamError, (alloc, streamError)); } else { if (streamError->domain == kCFStreamErrorDomainPOSIX) { - return CFErrorCreate(alloc, kCFErrorDomainPOSIX, streamError->error, NULL); + result = CFErrorCreate(alloc, kCFErrorDomainPOSIX, streamError->error, NULL); } else if (streamError->domain == kCFStreamErrorDomainMacOSStatus) { - return CFErrorCreate(alloc, kCFErrorDomainOSStatus, streamError->error, NULL); + result = CFErrorCreate(alloc, kCFErrorDomainOSStatus, streamError->error, NULL); } else { CFStringRef key = CFSTR("CFStreamErrorDomainKey"); CFNumberRef value = CFNumberCreate(alloc, kCFNumberCFIndexType, &streamError->domain); From e11e8e32f8d43cd8762d6ffd3e1ed2ddbbd8b0c9 Mon Sep 17 00:00:00 2001 From: pi1024e Date: Wed, 31 Jul 2019 15:44:06 -0400 Subject: [PATCH 02/14] Fixed whitespace --- CoreFoundation/Stream.subproj/CFSocketStream.c | 1 - 1 file changed, 1 deletion(-) diff --git a/CoreFoundation/Stream.subproj/CFSocketStream.c b/CoreFoundation/Stream.subproj/CFSocketStream.c index 58ae6ac663..1bc688987c 100644 --- a/CoreFoundation/Stream.subproj/CFSocketStream.c +++ b/CoreFoundation/Stream.subproj/CFSocketStream.c @@ -226,7 +226,6 @@ CF_PRIVATE CFErrorRef _CFErrorFromStreamError(CFAllocatorRef alloc, CFStreamErro canUpCall = (CFNetworkSupport._CFErrorCreateWithStreamError != NULL); __CFUnlock(&(CFNetworkSupport.lock)); - if (canUpCall) { result = CFNETWORK_CALL(_CFErrorCreateWithStreamError, (alloc, streamError)); } else { From 894ac85404c2feb234e18e33c7b8cf634209679e Mon Sep 17 00:00:00 2001 From: pi1024e Date: Wed, 31 Jul 2019 15:56:36 -0400 Subject: [PATCH 03/14] Fixed --- CoreFoundation/Stream.subproj/CFSocketStream.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/CoreFoundation/Stream.subproj/CFSocketStream.c b/CoreFoundation/Stream.subproj/CFSocketStream.c index 1bc688987c..78069bb3b0 100644 --- a/CoreFoundation/Stream.subproj/CFSocketStream.c +++ b/CoreFoundation/Stream.subproj/CFSocketStream.c @@ -191,7 +191,6 @@ CF_EXPORT void CFStreamCreatePairWithPeerSocketSignature(CFAllocatorRef alloc, c } CF_PRIVATE CFStreamError _CFStreamErrorFromError(CFErrorRef error) { - CFStreamError result; Boolean canUpCall; __CFLock(&(CFNetworkSupport.lock)); @@ -200,8 +199,9 @@ CF_PRIVATE CFStreamError _CFStreamErrorFromError(CFErrorRef error) { __CFUnlock(&(CFNetworkSupport.lock)); if (canUpCall) { - result = CFNETWORK_CALL(_CFStreamErrorFromCFError, (error)); + return CFNETWORK_CALL(_CFStreamErrorFromCFError, (error)); } else { + CFStreamError result; CFStringRef domain = CFErrorGetDomain(error); if (CFEqual(domain, kCFErrorDomainPOSIX)) { result.domain = kCFStreamErrorDomainPOSIX; @@ -213,12 +213,11 @@ CF_PRIVATE CFStreamError _CFStreamErrorFromError(CFErrorRef error) { result.domain = kCFStreamErrorDomainCustom; } result.error = CFErrorGetCode(error); + return result; } - return result; } CF_PRIVATE CFErrorRef _CFErrorFromStreamError(CFAllocatorRef alloc, CFStreamError *streamError) { - CFErrorRef result; Boolean canUpCall; __CFLock(&(CFNetworkSupport.lock)); @@ -227,20 +226,20 @@ CF_PRIVATE CFErrorRef _CFErrorFromStreamError(CFAllocatorRef alloc, CFStreamErro __CFUnlock(&(CFNetworkSupport.lock)); if (canUpCall) { - result = CFNETWORK_CALL(_CFErrorCreateWithStreamError, (alloc, streamError)); + return CFNETWORK_CALL(_CFErrorCreateWithStreamError, (alloc, streamError)); } else { if (streamError->domain == kCFStreamErrorDomainPOSIX) { - result = CFErrorCreate(alloc, kCFErrorDomainPOSIX, streamError->error, NULL); + return CFErrorCreate(alloc, kCFErrorDomainPOSIX, streamError->error, NULL); } else if (streamError->domain == kCFStreamErrorDomainMacOSStatus) { - result = CFErrorCreate(alloc, kCFErrorDomainOSStatus, streamError->error, NULL); + return CFErrorCreate(alloc, kCFErrorDomainOSStatus, streamError->error, NULL); } else { CFStringRef key = CFSTR("CFStreamErrorDomainKey"); CFNumberRef value = CFNumberCreate(alloc, kCFNumberCFIndexType, &streamError->domain); CFDictionaryRef dict = CFDictionaryCreate(alloc, (const void **)(&key), (const void **)(&value), 1, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); - result = CFErrorCreate(alloc, CFSTR("BogusCFStreamErrorCompatibilityDomain"), streamError->error, dict); + CFErrorRef result = CFErrorCreate(alloc, CFSTR("BogusCFStreamErrorCompatibilityDomain"), streamError->error, dict); CFRelease(value); CFRelease(dict); + return result; } } - return result; } From 5b9509c3c1570c5bb300213fb1ce64af3aed4d94 Mon Sep 17 00:00:00 2001 From: pi1024e Date: Wed, 31 Jul 2019 16:16:16 -0400 Subject: [PATCH 04/14] More refactoring --- .../Stream.subproj/CFSocketStream.c | 57 ++++++++++--------- 1 file changed, 30 insertions(+), 27 deletions(-) diff --git a/CoreFoundation/Stream.subproj/CFSocketStream.c b/CoreFoundation/Stream.subproj/CFSocketStream.c index 78069bb3b0..4dfcf88de0 100644 --- a/CoreFoundation/Stream.subproj/CFSocketStream.c +++ b/CoreFoundation/Stream.subproj/CFSocketStream.c @@ -200,21 +200,22 @@ CF_PRIVATE CFStreamError _CFStreamErrorFromError(CFErrorRef error) { if (canUpCall) { return CFNETWORK_CALL(_CFStreamErrorFromCFError, (error)); + } + + CFStreamError result; + CFStringRef domain = CFErrorGetDomain(error); + if (CFEqual(domain, kCFErrorDomainPOSIX)) { + result.domain = kCFStreamErrorDomainPOSIX; + } else if (CFEqual(domain, kCFErrorDomainOSStatus)) { + result.domain = kCFStreamErrorDomainMacOSStatus; + } else if (CFEqual(domain, kCFErrorDomainMach)) { + result.domain = 11; // kCFStreamErrorDomainMach, but that symbol is in CFNetwork } else { - CFStreamError result; - CFStringRef domain = CFErrorGetDomain(error); - if (CFEqual(domain, kCFErrorDomainPOSIX)) { - result.domain = kCFStreamErrorDomainPOSIX; - } else if (CFEqual(domain, kCFErrorDomainOSStatus)) { - result.domain = kCFStreamErrorDomainMacOSStatus; - } else if (CFEqual(domain, kCFErrorDomainMach)) { - result.domain = 11; // kCFStreamErrorDomainMach, but that symbol is in CFNetwork - } else { - result.domain = kCFStreamErrorDomainCustom; - } - result.error = CFErrorGetCode(error); - return result; + result.domain = kCFStreamErrorDomainCustom; } + result.error = CFErrorGetCode(error); + return result; + } CF_PRIVATE CFErrorRef _CFErrorFromStreamError(CFAllocatorRef alloc, CFStreamError *streamError) { @@ -227,19 +228,21 @@ CF_PRIVATE CFErrorRef _CFErrorFromStreamError(CFAllocatorRef alloc, CFStreamErro if (canUpCall) { return CFNETWORK_CALL(_CFErrorCreateWithStreamError, (alloc, streamError)); - } else { - if (streamError->domain == kCFStreamErrorDomainPOSIX) { - return CFErrorCreate(alloc, kCFErrorDomainPOSIX, streamError->error, NULL); - } else if (streamError->domain == kCFStreamErrorDomainMacOSStatus) { - return CFErrorCreate(alloc, kCFErrorDomainOSStatus, streamError->error, NULL); - } else { - CFStringRef key = CFSTR("CFStreamErrorDomainKey"); - CFNumberRef value = CFNumberCreate(alloc, kCFNumberCFIndexType, &streamError->domain); - CFDictionaryRef dict = CFDictionaryCreate(alloc, (const void **)(&key), (const void **)(&value), 1, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); - CFErrorRef result = CFErrorCreate(alloc, CFSTR("BogusCFStreamErrorCompatibilityDomain"), streamError->error, dict); - CFRelease(value); - CFRelease(dict); - return result; - } + } + if (streamError->domain == kCFStreamErrorDomainPOSIX) { + return CFErrorCreate(alloc, kCFErrorDomainPOSIX, streamError->error, NULL); + } + if (streamError->domain == kCFStreamErrorDomainMacOSStatus) { + return CFErrorCreate(alloc, kCFErrorDomainOSStatus, streamError->error, NULL); + } + + CFStringRef key = CFSTR("CFStreamErrorDomainKey"); + CFNumberRef value = CFNumberCreate(alloc, kCFNumberCFIndexType, &streamError->domain); + CFDictionaryRef dict = CFDictionaryCreate(alloc, (const void **)(&key), (const void **)(&value), 1, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); + CFErrorRef result = CFErrorCreate(alloc, CFSTR("BogusCFStreamErrorCompatibilityDomain"), streamError->error, dict); + CFRelease(value); + CFRelease(dict); + return result; + } } From 47a8291ec355fce1cbcf710f93e92ed8b759f114 Mon Sep 17 00:00:00 2001 From: pi1024e Date: Wed, 31 Jul 2019 16:16:33 -0400 Subject: [PATCH 05/14] More refactoring --- CoreFoundation/Stream.subproj/CFSocketStream.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CoreFoundation/Stream.subproj/CFSocketStream.c b/CoreFoundation/Stream.subproj/CFSocketStream.c index 4dfcf88de0..74f8d6c70f 100644 --- a/CoreFoundation/Stream.subproj/CFSocketStream.c +++ b/CoreFoundation/Stream.subproj/CFSocketStream.c @@ -201,7 +201,7 @@ CF_PRIVATE CFStreamError _CFStreamErrorFromError(CFErrorRef error) { if (canUpCall) { return CFNETWORK_CALL(_CFStreamErrorFromCFError, (error)); } - + CFStreamError result; CFStringRef domain = CFErrorGetDomain(error); if (CFEqual(domain, kCFErrorDomainPOSIX)) { @@ -243,6 +243,5 @@ CF_PRIVATE CFErrorRef _CFErrorFromStreamError(CFAllocatorRef alloc, CFStreamErro CFRelease(value); CFRelease(dict); return result; - } } From cc2497f316ec046904b463e57146adf7ad8fc54a Mon Sep 17 00:00:00 2001 From: pi1024e <49824824+pi1024e@users.noreply.github.com> Date: Thu, 1 Aug 2019 07:43:20 -0400 Subject: [PATCH 06/14] Update CoreFoundation/Stream.subproj/CFSocketStream.c Co-Authored-By: Xiaodi Wu --- CoreFoundation/Stream.subproj/CFSocketStream.c | 1 - 1 file changed, 1 deletion(-) diff --git a/CoreFoundation/Stream.subproj/CFSocketStream.c b/CoreFoundation/Stream.subproj/CFSocketStream.c index 74f8d6c70f..f7da9ec5de 100644 --- a/CoreFoundation/Stream.subproj/CFSocketStream.c +++ b/CoreFoundation/Stream.subproj/CFSocketStream.c @@ -215,7 +215,6 @@ CF_PRIVATE CFStreamError _CFStreamErrorFromError(CFErrorRef error) { } result.error = CFErrorGetCode(error); return result; - } CF_PRIVATE CFErrorRef _CFErrorFromStreamError(CFAllocatorRef alloc, CFStreamError *streamError) { From f84be409da14d0204834f5ef6e28b3b37def6303 Mon Sep 17 00:00:00 2001 From: pi1024e Date: Thu, 1 Aug 2019 07:44:46 -0400 Subject: [PATCH 07/14] Fixed Indentation --- CoreFoundation/Stream.subproj/CFSocketStream.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CoreFoundation/Stream.subproj/CFSocketStream.c b/CoreFoundation/Stream.subproj/CFSocketStream.c index f7da9ec5de..df31ea519a 100644 --- a/CoreFoundation/Stream.subproj/CFSocketStream.c +++ b/CoreFoundation/Stream.subproj/CFSocketStream.c @@ -209,7 +209,7 @@ CF_PRIVATE CFStreamError _CFStreamErrorFromError(CFErrorRef error) { } else if (CFEqual(domain, kCFErrorDomainOSStatus)) { result.domain = kCFStreamErrorDomainMacOSStatus; } else if (CFEqual(domain, kCFErrorDomainMach)) { - result.domain = 11; // kCFStreamErrorDomainMach, but that symbol is in CFNetwork + result.domain = 11; // kCFStreamErrorDomainMach, but that symbol is in CFNetwork } else { result.domain = kCFStreamErrorDomainCustom; } @@ -242,5 +242,4 @@ CF_PRIVATE CFErrorRef _CFErrorFromStreamError(CFAllocatorRef alloc, CFStreamErro CFRelease(value); CFRelease(dict); return result; - } } From 81c7541ba359fa227b3c5d6cf15b22c4e259d25b Mon Sep 17 00:00:00 2001 From: pi1024e Date: Sat, 3 Aug 2019 11:48:27 -0400 Subject: [PATCH 08/14] Revert "Fixed Indentation" This reverts commit f84be409da14d0204834f5ef6e28b3b37def6303. --- CoreFoundation/Stream.subproj/CFSocketStream.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CoreFoundation/Stream.subproj/CFSocketStream.c b/CoreFoundation/Stream.subproj/CFSocketStream.c index df31ea519a..f7da9ec5de 100644 --- a/CoreFoundation/Stream.subproj/CFSocketStream.c +++ b/CoreFoundation/Stream.subproj/CFSocketStream.c @@ -209,7 +209,7 @@ CF_PRIVATE CFStreamError _CFStreamErrorFromError(CFErrorRef error) { } else if (CFEqual(domain, kCFErrorDomainOSStatus)) { result.domain = kCFStreamErrorDomainMacOSStatus; } else if (CFEqual(domain, kCFErrorDomainMach)) { - result.domain = 11; // kCFStreamErrorDomainMach, but that symbol is in CFNetwork + result.domain = 11; // kCFStreamErrorDomainMach, but that symbol is in CFNetwork } else { result.domain = kCFStreamErrorDomainCustom; } @@ -242,4 +242,5 @@ CF_PRIVATE CFErrorRef _CFErrorFromStreamError(CFAllocatorRef alloc, CFStreamErro CFRelease(value); CFRelease(dict); return result; + } } From 1c6d8cea54a65fc1a44cee0e6de75b0af96e2f19 Mon Sep 17 00:00:00 2001 From: pi1024e Date: Sat, 3 Aug 2019 11:48:29 -0400 Subject: [PATCH 09/14] Revert "Update CoreFoundation/Stream.subproj/CFSocketStream.c" This reverts commit cc2497f316ec046904b463e57146adf7ad8fc54a. --- CoreFoundation/Stream.subproj/CFSocketStream.c | 1 + 1 file changed, 1 insertion(+) diff --git a/CoreFoundation/Stream.subproj/CFSocketStream.c b/CoreFoundation/Stream.subproj/CFSocketStream.c index f7da9ec5de..74f8d6c70f 100644 --- a/CoreFoundation/Stream.subproj/CFSocketStream.c +++ b/CoreFoundation/Stream.subproj/CFSocketStream.c @@ -215,6 +215,7 @@ CF_PRIVATE CFStreamError _CFStreamErrorFromError(CFErrorRef error) { } result.error = CFErrorGetCode(error); return result; + } CF_PRIVATE CFErrorRef _CFErrorFromStreamError(CFAllocatorRef alloc, CFStreamError *streamError) { From b3f5140a63cbbbadeea6926b9e617ba43a8a86ba Mon Sep 17 00:00:00 2001 From: pi1024e Date: Sat, 3 Aug 2019 11:48:34 -0400 Subject: [PATCH 10/14] Revert "More refactoring" This reverts commit 47a8291ec355fce1cbcf710f93e92ed8b759f114. --- CoreFoundation/Stream.subproj/CFSocketStream.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CoreFoundation/Stream.subproj/CFSocketStream.c b/CoreFoundation/Stream.subproj/CFSocketStream.c index 74f8d6c70f..4dfcf88de0 100644 --- a/CoreFoundation/Stream.subproj/CFSocketStream.c +++ b/CoreFoundation/Stream.subproj/CFSocketStream.c @@ -201,7 +201,7 @@ CF_PRIVATE CFStreamError _CFStreamErrorFromError(CFErrorRef error) { if (canUpCall) { return CFNETWORK_CALL(_CFStreamErrorFromCFError, (error)); } - + CFStreamError result; CFStringRef domain = CFErrorGetDomain(error); if (CFEqual(domain, kCFErrorDomainPOSIX)) { @@ -243,5 +243,6 @@ CF_PRIVATE CFErrorRef _CFErrorFromStreamError(CFAllocatorRef alloc, CFStreamErro CFRelease(value); CFRelease(dict); return result; + } } From b29201db717ce5185f3294b2c25c0c3a1d3492b3 Mon Sep 17 00:00:00 2001 From: pi1024e Date: Sat, 3 Aug 2019 11:48:45 -0400 Subject: [PATCH 11/14] Revert "More refactoring" This reverts commit 5b9509c3c1570c5bb300213fb1ce64af3aed4d94. --- .../Stream.subproj/CFSocketStream.c | 57 +++++++++---------- 1 file changed, 27 insertions(+), 30 deletions(-) diff --git a/CoreFoundation/Stream.subproj/CFSocketStream.c b/CoreFoundation/Stream.subproj/CFSocketStream.c index 4dfcf88de0..78069bb3b0 100644 --- a/CoreFoundation/Stream.subproj/CFSocketStream.c +++ b/CoreFoundation/Stream.subproj/CFSocketStream.c @@ -200,22 +200,21 @@ CF_PRIVATE CFStreamError _CFStreamErrorFromError(CFErrorRef error) { if (canUpCall) { return CFNETWORK_CALL(_CFStreamErrorFromCFError, (error)); - } - - CFStreamError result; - CFStringRef domain = CFErrorGetDomain(error); - if (CFEqual(domain, kCFErrorDomainPOSIX)) { - result.domain = kCFStreamErrorDomainPOSIX; - } else if (CFEqual(domain, kCFErrorDomainOSStatus)) { - result.domain = kCFStreamErrorDomainMacOSStatus; - } else if (CFEqual(domain, kCFErrorDomainMach)) { - result.domain = 11; // kCFStreamErrorDomainMach, but that symbol is in CFNetwork } else { - result.domain = kCFStreamErrorDomainCustom; + CFStreamError result; + CFStringRef domain = CFErrorGetDomain(error); + if (CFEqual(domain, kCFErrorDomainPOSIX)) { + result.domain = kCFStreamErrorDomainPOSIX; + } else if (CFEqual(domain, kCFErrorDomainOSStatus)) { + result.domain = kCFStreamErrorDomainMacOSStatus; + } else if (CFEqual(domain, kCFErrorDomainMach)) { + result.domain = 11; // kCFStreamErrorDomainMach, but that symbol is in CFNetwork + } else { + result.domain = kCFStreamErrorDomainCustom; + } + result.error = CFErrorGetCode(error); + return result; } - result.error = CFErrorGetCode(error); - return result; - } CF_PRIVATE CFErrorRef _CFErrorFromStreamError(CFAllocatorRef alloc, CFStreamError *streamError) { @@ -228,21 +227,19 @@ CF_PRIVATE CFErrorRef _CFErrorFromStreamError(CFAllocatorRef alloc, CFStreamErro if (canUpCall) { return CFNETWORK_CALL(_CFErrorCreateWithStreamError, (alloc, streamError)); - } - if (streamError->domain == kCFStreamErrorDomainPOSIX) { - return CFErrorCreate(alloc, kCFErrorDomainPOSIX, streamError->error, NULL); - } - if (streamError->domain == kCFStreamErrorDomainMacOSStatus) { - return CFErrorCreate(alloc, kCFErrorDomainOSStatus, streamError->error, NULL); - } - - CFStringRef key = CFSTR("CFStreamErrorDomainKey"); - CFNumberRef value = CFNumberCreate(alloc, kCFNumberCFIndexType, &streamError->domain); - CFDictionaryRef dict = CFDictionaryCreate(alloc, (const void **)(&key), (const void **)(&value), 1, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); - CFErrorRef result = CFErrorCreate(alloc, CFSTR("BogusCFStreamErrorCompatibilityDomain"), streamError->error, dict); - CFRelease(value); - CFRelease(dict); - return result; - + } else { + if (streamError->domain == kCFStreamErrorDomainPOSIX) { + return CFErrorCreate(alloc, kCFErrorDomainPOSIX, streamError->error, NULL); + } else if (streamError->domain == kCFStreamErrorDomainMacOSStatus) { + return CFErrorCreate(alloc, kCFErrorDomainOSStatus, streamError->error, NULL); + } else { + CFStringRef key = CFSTR("CFStreamErrorDomainKey"); + CFNumberRef value = CFNumberCreate(alloc, kCFNumberCFIndexType, &streamError->domain); + CFDictionaryRef dict = CFDictionaryCreate(alloc, (const void **)(&key), (const void **)(&value), 1, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); + CFErrorRef result = CFErrorCreate(alloc, CFSTR("BogusCFStreamErrorCompatibilityDomain"), streamError->error, dict); + CFRelease(value); + CFRelease(dict); + return result; + } } } From 9fb189fff9411ad7dc18eed168998ddfa97be469 Mon Sep 17 00:00:00 2001 From: pi1024e Date: Sat, 3 Aug 2019 11:48:58 -0400 Subject: [PATCH 12/14] Revert "Fixed" This reverts commit 894ac85404c2feb234e18e33c7b8cf634209679e. --- CoreFoundation/Stream.subproj/CFSocketStream.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/CoreFoundation/Stream.subproj/CFSocketStream.c b/CoreFoundation/Stream.subproj/CFSocketStream.c index 78069bb3b0..1bc688987c 100644 --- a/CoreFoundation/Stream.subproj/CFSocketStream.c +++ b/CoreFoundation/Stream.subproj/CFSocketStream.c @@ -191,6 +191,7 @@ CF_EXPORT void CFStreamCreatePairWithPeerSocketSignature(CFAllocatorRef alloc, c } CF_PRIVATE CFStreamError _CFStreamErrorFromError(CFErrorRef error) { + CFStreamError result; Boolean canUpCall; __CFLock(&(CFNetworkSupport.lock)); @@ -199,9 +200,8 @@ CF_PRIVATE CFStreamError _CFStreamErrorFromError(CFErrorRef error) { __CFUnlock(&(CFNetworkSupport.lock)); if (canUpCall) { - return CFNETWORK_CALL(_CFStreamErrorFromCFError, (error)); + result = CFNETWORK_CALL(_CFStreamErrorFromCFError, (error)); } else { - CFStreamError result; CFStringRef domain = CFErrorGetDomain(error); if (CFEqual(domain, kCFErrorDomainPOSIX)) { result.domain = kCFStreamErrorDomainPOSIX; @@ -213,11 +213,12 @@ CF_PRIVATE CFStreamError _CFStreamErrorFromError(CFErrorRef error) { result.domain = kCFStreamErrorDomainCustom; } result.error = CFErrorGetCode(error); - return result; } + return result; } CF_PRIVATE CFErrorRef _CFErrorFromStreamError(CFAllocatorRef alloc, CFStreamError *streamError) { + CFErrorRef result; Boolean canUpCall; __CFLock(&(CFNetworkSupport.lock)); @@ -226,20 +227,20 @@ CF_PRIVATE CFErrorRef _CFErrorFromStreamError(CFAllocatorRef alloc, CFStreamErro __CFUnlock(&(CFNetworkSupport.lock)); if (canUpCall) { - return CFNETWORK_CALL(_CFErrorCreateWithStreamError, (alloc, streamError)); + result = CFNETWORK_CALL(_CFErrorCreateWithStreamError, (alloc, streamError)); } else { if (streamError->domain == kCFStreamErrorDomainPOSIX) { - return CFErrorCreate(alloc, kCFErrorDomainPOSIX, streamError->error, NULL); + result = CFErrorCreate(alloc, kCFErrorDomainPOSIX, streamError->error, NULL); } else if (streamError->domain == kCFStreamErrorDomainMacOSStatus) { - return CFErrorCreate(alloc, kCFErrorDomainOSStatus, streamError->error, NULL); + result = CFErrorCreate(alloc, kCFErrorDomainOSStatus, streamError->error, NULL); } else { CFStringRef key = CFSTR("CFStreamErrorDomainKey"); CFNumberRef value = CFNumberCreate(alloc, kCFNumberCFIndexType, &streamError->domain); CFDictionaryRef dict = CFDictionaryCreate(alloc, (const void **)(&key), (const void **)(&value), 1, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); - CFErrorRef result = CFErrorCreate(alloc, CFSTR("BogusCFStreamErrorCompatibilityDomain"), streamError->error, dict); + result = CFErrorCreate(alloc, CFSTR("BogusCFStreamErrorCompatibilityDomain"), streamError->error, dict); CFRelease(value); CFRelease(dict); - return result; } } + return result; } From 5bc408699297ed66ed7be1b6e97074f11217f6d0 Mon Sep 17 00:00:00 2001 From: pi1024e Date: Sat, 3 Aug 2019 11:49:01 -0400 Subject: [PATCH 13/14] Revert "Fixed whitespace" This reverts commit e11e8e32f8d43cd8762d6ffd3e1ed2ddbbd8b0c9. --- CoreFoundation/Stream.subproj/CFSocketStream.c | 1 + 1 file changed, 1 insertion(+) diff --git a/CoreFoundation/Stream.subproj/CFSocketStream.c b/CoreFoundation/Stream.subproj/CFSocketStream.c index 1bc688987c..58ae6ac663 100644 --- a/CoreFoundation/Stream.subproj/CFSocketStream.c +++ b/CoreFoundation/Stream.subproj/CFSocketStream.c @@ -226,6 +226,7 @@ CF_PRIVATE CFErrorRef _CFErrorFromStreamError(CFAllocatorRef alloc, CFStreamErro canUpCall = (CFNetworkSupport._CFErrorCreateWithStreamError != NULL); __CFUnlock(&(CFNetworkSupport.lock)); + if (canUpCall) { result = CFNETWORK_CALL(_CFErrorCreateWithStreamError, (alloc, streamError)); } else { From 621b6dda0bff190a72982f4f13049e14848a6dcc Mon Sep 17 00:00:00 2001 From: pi1024e Date: Sat, 3 Aug 2019 11:49:06 -0400 Subject: [PATCH 14/14] Revert "Made methods in CFSocketStream consistent in style" This reverts commit 628b1c16d22b9dc45c9b634309b5015c2c58c69a. --- CoreFoundation/Stream.subproj/CFSocketStream.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/CoreFoundation/Stream.subproj/CFSocketStream.c b/CoreFoundation/Stream.subproj/CFSocketStream.c index 58ae6ac663..0c8e02eb53 100644 --- a/CoreFoundation/Stream.subproj/CFSocketStream.c +++ b/CoreFoundation/Stream.subproj/CFSocketStream.c @@ -220,20 +220,19 @@ CF_PRIVATE CFStreamError _CFStreamErrorFromError(CFErrorRef error) { CF_PRIVATE CFErrorRef _CFErrorFromStreamError(CFAllocatorRef alloc, CFStreamError *streamError) { CFErrorRef result; Boolean canUpCall; - + __CFLock(&(CFNetworkSupport.lock)); if (!__CFBitIsSet(CFNetworkSupport.flags, kTriedToLoad)) initializeCFNetworkSupport(); canUpCall = (CFNetworkSupport._CFErrorCreateWithStreamError != NULL); __CFUnlock(&(CFNetworkSupport.lock)); - if (canUpCall) { result = CFNETWORK_CALL(_CFErrorCreateWithStreamError, (alloc, streamError)); } else { if (streamError->domain == kCFStreamErrorDomainPOSIX) { - result = CFErrorCreate(alloc, kCFErrorDomainPOSIX, streamError->error, NULL); + return CFErrorCreate(alloc, kCFErrorDomainPOSIX, streamError->error, NULL); } else if (streamError->domain == kCFStreamErrorDomainMacOSStatus) { - result = CFErrorCreate(alloc, kCFErrorDomainOSStatus, streamError->error, NULL); + return CFErrorCreate(alloc, kCFErrorDomainOSStatus, streamError->error, NULL); } else { CFStringRef key = CFSTR("CFStreamErrorDomainKey"); CFNumberRef value = CFNumberCreate(alloc, kCFNumberCFIndexType, &streamError->domain);