Skip to content

[gardening] Use defer for end-of-scope calls #902

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
swift-ci merged 2 commits into from
Mar 10, 2017
Merged

[gardening] Use defer for end-of-scope calls #902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67bd63f
defer usage where possible
Mar 2, 2017
7b5e6f9
Revert 'defer' for lock()/unlock()
naithar Mar 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Foundation/NSKeyedArchiver.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,13 +159,13 @@ open class NSKeyedArchiver : NSCoder {
return false
}

defer { CFWriteStreamClose(writeStream) }

let keyedArchiver = NSKeyedArchiver(output: writeStream)

keyedArchiver.encode(rootObject, forKey: NSKeyedArchiveRootObjectKey)
keyedArchiver.finishEncoding()
finishedEncoding = keyedArchiver._flags.contains(ArchiverFlags.finishedEncoding)

CFWriteStreamClose(writeStream)

return finishedEncoding
}
Expand Down
4 changes: 2 additions & 2 deletions Foundation/NSKeyedUnarchiver.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,15 @@ open class NSKeyedUnarchiver : NSCoder {
return nil
}

defer { CFReadStreamClose(readStream) }

let keyedUnarchiver = NSKeyedUnarchiver(stream: Stream.stream(readStream))
do {
try root = keyedUnarchiver.decodeTopLevelObject(forKey: NSKeyedArchiveRootObjectKey)
keyedUnarchiver.finishDecoding()
} catch {
}

CFReadStreamClose(readStream)

return root
}

Expand Down
8 changes: 4 additions & 4 deletions Foundation/NSXMLParser.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,9 +559,12 @@ open class XMLParser : NSObject {
internal func parseFromStream() -> Bool {
var result = true
XMLParser.setCurrentParser(self)
defer { XMLParser.setCurrentParser(nil) }
if let stream = _stream {
stream.open()
defer { stream.close() }
let buffer = malloc(_chunkSize)!.bindMemory(to: UInt8.self, capacity: _chunkSize)
defer { free(buffer) }
var len = stream.read(buffer, maxLength: _chunkSize)
if len != -1 {
while len > 0 {
Expand All @@ -572,10 +575,9 @@ open class XMLParser : NSObject {
} else {
result = false
}
free(buffer)
stream.close()
} else if let data = _data {
let buffer = malloc(_chunkSize)!.bindMemory(to: UInt8.self, capacity: _chunkSize)
defer { free(buffer) }
var range = NSMakeRange(0, min(_chunkSize, data.count))
while result {
let chunk = data.withUnsafeBytes { (buffer: UnsafePointer<UInt8>) -> Data in
Expand All @@ -588,11 +590,9 @@ open class XMLParser : NSObject {
}
range = NSMakeRange(range.location + range.length, min(_chunkSize, data.count - (range.location + range.length)))
}
free(buffer)
} else {
result = false
}
XMLParser.setCurrentParser(nil)
return result
}

Expand Down