Skip to content

Commit f641ca8

Browse files
committed
[stdlib] remove incorrect uses of pointer conversion
1 parent cb04de1 commit f641ca8

File tree

2 files changed

+14
-13
lines changed

2 files changed

+14
-13
lines changed

stdlib/private/StdlibUnittest/StdlibUnittest.swift

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2182,9 +2182,10 @@ func _getSystemVersionPlistProperty(_ propertyName: String) -> String? {
21822182
func _getSystemVersionPlistProperty(_ propertyName: String) -> String? {
21832183
var count = 0
21842184
sysctlbyname("kern.osproductversion", nil, &count, nil, 0)
2185-
var s = [CChar](repeating: 0, count: count)
2186-
sysctlbyname("kern.osproductversion", &s, &count, nil, 0)
2187-
return String(cString: &s)
2185+
return withUnsafeTemporaryAllocation(of: CChar.self, capacity: count) {
2186+
sysctlbyname("kern.osproductversion", $0.baseAddress, &count, nil, 0)
2187+
return String(cString: $0.baseAddress!)
2188+
}
21882189
}
21892190
#endif
21902191
#endif

stdlib/private/SwiftReflectionTest/SwiftReflectionTest.swift

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -373,25 +373,25 @@ internal func reflect(instanceAddress: UInt,
373373
shouldUnwrapClassExistential: Bool = false) {
374374
while let command = readLine(strippingNewline: true) {
375375
switch command {
376-
case String(validatingUTF8: RequestInstanceKind)!:
376+
case RequestInstanceKind:
377377
sendValue(kind.rawValue)
378-
case String(validatingUTF8: RequestShouldUnwrapClassExistential)!:
378+
case RequestShouldUnwrapClassExistential:
379379
sendValue(shouldUnwrapClassExistential)
380-
case String(validatingUTF8: RequestInstanceAddress)!:
380+
case RequestInstanceAddress:
381381
sendValue(instanceAddress)
382-
case String(validatingUTF8: RequestReflectionInfos)!:
382+
case RequestReflectionInfos:
383383
sendReflectionInfos()
384-
case String(validatingUTF8: RequestImages)!:
384+
case RequestImages:
385385
sendImages()
386-
case String(validatingUTF8: RequestReadBytes)!:
386+
case RequestReadBytes:
387387
sendBytes()
388-
case String(validatingUTF8: RequestSymbolAddress)!:
388+
case RequestSymbolAddress:
389389
sendSymbolAddress()
390-
case String(validatingUTF8: RequestStringLength)!:
390+
case RequestStringLength:
391391
sendStringLength()
392-
case String(validatingUTF8: RequestPointerSize)!:
392+
case RequestPointerSize:
393393
sendPointerSize()
394-
case String(validatingUTF8: RequestDone)!:
394+
case RequestDone:
395395
return
396396
default:
397397
fatalError("Unknown request received: '\(Array(command.utf8))'!")

0 commit comments

Comments
 (0)