Skip to content

Commit a7c033b

Browse files
spevansianpartridge
authored andcommitted
NSString: Remove incorrect init?(CString:encoding:) method (#1221)
- This is a misspelt duplicate of init?(cString:encoding:)
1 parent d3fe099 commit a7c033b

File tree

2 files changed

+3
-15
lines changed

2 files changed

+3
-15
lines changed

Foundation/NSString.swift

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1221,18 +1221,6 @@ extension NSString {
12211221
free(bytes)
12221222
}
12231223
}
1224-
1225-
public convenience init?(CString nullTerminatedCString: UnsafePointer<Int8>, encoding: UInt) {
1226-
guard let cf = CFStringCreateWithCString(kCFAllocatorSystemDefault, nullTerminatedCString, CFStringConvertNSStringEncodingToEncoding(encoding)) else {
1227-
return nil
1228-
}
1229-
var str: String?
1230-
if String._conditionallyBridgeFromObjectiveC(cf._nsObject, result: &str) {
1231-
self.init(str!)
1232-
} else {
1233-
return nil
1234-
}
1235-
}
12361224

12371225
public convenience init(contentsOf url: URL, encoding enc: UInt) throws {
12381226
let readResult = try NSData(contentsOf: url, options: [])

TestFoundation/TestNSString.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -265,21 +265,21 @@ class TestNSString : XCTestCase {
265265

266266
func test_FromNullTerminatedCStringInASCII() {
267267
let bytes = mockASCIIStringBytes + [0x00]
268-
let string = NSString(CString: bytes.map { Int8(bitPattern: $0) }, encoding: String.Encoding.ascii.rawValue)
268+
let string = NSString(cString: bytes.map { Int8(bitPattern: $0) }, encoding: String.Encoding.ascii.rawValue)
269269
XCTAssertNotNil(string)
270270
XCTAssertTrue(string?.isEqual(to: mockASCIIString) ?? false)
271271
}
272272

273273
func test_FromNullTerminatedCStringInUTF8() {
274274
let bytes = mockUTF8StringBytes + [0x00]
275-
let string = NSString(CString: bytes.map { Int8(bitPattern: $0) }, encoding: String.Encoding.utf8.rawValue)
275+
let string = NSString(cString: bytes.map { Int8(bitPattern: $0) }, encoding: String.Encoding.utf8.rawValue)
276276
XCTAssertNotNil(string)
277277
XCTAssertTrue(string?.isEqual(to: mockUTF8String) ?? false)
278278
}
279279

280280
func test_FromMalformedNullTerminatedCStringInUTF8() {
281281
let bytes = mockMalformedUTF8StringBytes + [0x00]
282-
let string = NSString(CString: bytes.map { Int8(bitPattern: $0) }, encoding: String.Encoding.utf8.rawValue)
282+
let string = NSString(cString: bytes.map { Int8(bitPattern: $0) }, encoding: String.Encoding.utf8.rawValue)
283283
XCTAssertNil(string)
284284
}
285285

0 commit comments

Comments
 (0)