Skip to content

Commit 12f9207

Browse files
committed
rename waitingData to waitingPackets
1 parent 0bf27b8 commit 12f9207

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

Source/SocketClientSpec.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
protocol SocketClientSpec: class {
2626
var nsp: String { get set }
27-
var waitingData: [SocketPacket] { get set }
27+
var waitingPackets: [SocketPacket] { get set }
2828

2929
func didConnect()
3030
func didDisconnect(reason: String)

Source/SocketIOClient.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public final class SocketIOClient: NSObject, SocketEngineClient, SocketParsable
5353
private(set) var handleQueue = dispatch_get_main_queue()
5454
private(set) var reconnectAttempts = -1
5555

56-
var waitingData = [SocketPacket]()
56+
var waitingPackets = [SocketPacket]()
5757

5858
/**
5959
Type safe way to create a new SocketIOClient. opts can be omitted
@@ -302,7 +302,7 @@ public final class SocketIOClient: NSObject, SocketEngineClient, SocketParsable
302302
}
303303

304304
public func engineDidClose(reason: String) {
305-
waitingData.removeAll()
305+
waitingPackets.removeAll()
306306

307307
if status == .Closed || !reconnects {
308308
didDisconnect(reason)

Source/SocketParsable.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ extension SocketParsable {
5050
case .Ack where isCorrectNamespace(pack.nsp):
5151
handleAck(pack.id, data: pack.data)
5252
case .BinaryEvent where isCorrectNamespace(pack.nsp):
53-
waitingData.append(pack)
53+
waitingPackets.append(pack)
5454
case .BinaryAck where isCorrectNamespace(pack.nsp):
55-
waitingData.append(pack)
55+
waitingPackets.append(pack)
5656
case .Connect:
5757
handleConnect(pack)
5858
case .Disconnect:
@@ -160,17 +160,17 @@ extension SocketParsable {
160160
}
161161

162162
func parseBinaryData(data: NSData) {
163-
guard !waitingData.isEmpty else {
163+
guard !waitingPackets.isEmpty else {
164164
DefaultSocketLogger.Logger.error("Got data when not remaking packet", type: "SocketParser")
165165
return
166166
}
167167

168168
// Should execute event?
169-
guard waitingData[waitingData.count - 1].addData(data) else {
169+
guard waitingPackets[waitingPackets.count - 1].addData(data) else {
170170
return
171171
}
172172

173-
let packet = waitingData.removeLast()
173+
let packet = waitingPackets.removeLast()
174174

175175
if packet.type != .BinaryAck {
176176
handleEvent(packet.event, data: packet.args ?? [],

0 commit comments

Comments
 (0)