dnrops
/
ZeroMQ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

some renamings

This commit is contained in:
badim 2016-10-26 17:30:41 +03:00
parent e888bdd8f0
commit 3df492a419
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Sources/Proxy.swift
View File

@ -24,6 +24,6 @@
import CZeroMQ import CZeroMQ
public func proxy(_ frontend: Socket, backend: Socket, capture: Socket? = nil) { public func proxy(frontend: Socket, backend: Socket, capture: Socket? = nil) {
zmq_proxy(frontend.socket, backend.socket, capture?.socket ?? nil) zmq_proxy(frontend.socket, backend.socket, capture?.socket)
} }

18
Sources/Socket.swift
View File

@ -197,11 +197,11 @@ public struct SocketEvent : OptionSet {
extension Socket { extension Socket {
func setOption(_ option: Int32, _ value: Bool) throws { func setOption(_ option: Int32, _ value: Bool) throws {
var value = value ? 1 : 0 var value = value ? 1 : 0
try setOption(option, value: &value, length: MemoryLayout<Int32>.stride) try setOption(option, value: &value, length: MemoryLayout<Int32>.size)
} }
func setOption(_ option: Int32, _ value: Int32) throws { func setOption(_ option: Int32, _ value: Int32) throws {
var value = value var value = value
try setOption(option, value: &value, length: MemoryLayout<Int32>.stride) try setOption(option, value: &value, length: MemoryLayout<Int32>.size)
} }
func setOption(_ option: Int32, _ value: String) throws { func setOption(_ option: Int32, _ value: String) throws {
try value.withCString { v in try value.withCString { v in
@ -227,7 +227,7 @@ extension Socket {
extension Socket { extension Socket {
public func setAffinity(_ value: UInt64) throws { public func setAffinity(_ value: UInt64) throws {
var value = value var value = value
try setOption(ZMQ_AFFINITY, value: &value, length: MemoryLayout<UInt64>.stride) try setOption(ZMQ_AFFINITY, value: &value, length: MemoryLayout<UInt64>.size)
} }
public func setBacklog(_ value: Int32) throws { public func setBacklog(_ value: Int32) throws {
@ -316,7 +316,7 @@ extension Socket {
public func setMaxMessageSize(_ value: Int64) throws { public func setMaxMessageSize(_ value: Int64) throws {
var value = value var value = value
try setOption(ZMQ_MAXMSGSIZE, value: &value, length: MemoryLayout<Int64>.stride) try setOption(ZMQ_MAXMSGSIZE, value: &value, length: MemoryLayout<Int64>.size)
} }
public func setMulticastHops(_ value: Int32) throws { public func setMulticastHops(_ value: Int32) throws {
@ -463,7 +463,7 @@ extension Socket {
extension Socket { extension Socket {
func getOption(_ option: Int32) throws -> Int32 { func getOption(_ option: Int32) throws -> Int32 {
var value: Int32 = 0 var value: Int32 = 0
var length = MemoryLayout<Int32>.stride var length = MemoryLayout<Int32>.size
try getOption(option, value: &value, length: &length) try getOption(option, value: &value, length: &length)
return value return value
} }
@ -482,7 +482,7 @@ extension Socket {
extension Socket { extension Socket {
public func getAffinity() throws -> UInt64 { public func getAffinity() throws -> UInt64 {
var value: UInt64 = 0 var value: UInt64 = 0
var length = MemoryLayout<UInt64>.stride var length = MemoryLayout<UInt64>.size
try getOption(ZMQ_AFFINITY, value: &value, length: &length) try getOption(ZMQ_AFFINITY, value: &value, length: &length)
return value return value
} }
@ -566,7 +566,7 @@ extension Socket {
public func getMaxMessageSize() throws -> Int64 { public func getMaxMessageSize() throws -> Int64 {
var value: Int64 = 0 var value: Int64 = 0
var length = MemoryLayout<Int64>.stride var length = MemoryLayout<Int64>.size
try getOption(ZMQ_MAXMSGSIZE, value: &value, length: &length) try getOption(ZMQ_MAXMSGSIZE, value: &value, length: &length)
return value return value
} }
@ -695,11 +695,11 @@ extension SecurityMechanism {
} }
extension Socket { extension Socket {
public func sendString(_ string: String, mode: SendMode = []) throws -> Bool { public func send(_ string: String, mode: SendMode = []) throws -> Bool {
return try send(Data(string.utf8), mode: mode) return try send(Data(string.utf8), mode: mode)
} }
public func receiveString(_ mode: ReceiveMode = []) throws -> String? { public func receive(_ mode: ReceiveMode = []) throws -> String? {
guard let buffer = try receive(mode: mode) else { guard let buffer = try receive(mode: mode) else {
return nil return nil
} }