jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert function names scheme due to the @dom96 comment

Browse source
This commit is contained in:
Anatoly Galiulin 2016-09-06 09:29:41 +07:00
commit 60dbfb2ec9
3 changed files with 16 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/pure/asyncnet.nim
View file

@ -205,7 +205,7 @@ template readInto(buf: pointer, size: int, socket: AsyncSocket,
sslRead(socket.sslHandle, cast[cstring](buf), size.cint))
res = opResult
else:
var recvIntoFut = recvBuffer(socket.fd.AsyncFD, buf, size, flags)
var recvIntoFut = asyncdispatch.recvInto(socket.fd.AsyncFD, buf, size, flags)
yield recvIntoFut
# Not in SSL mode.
res = recvIntoFut.read()
@ -218,7 +218,7 @@ template readIntoBuf(socket: AsyncSocket,
socket.bufLen = size
size
proc recvBuffer*(socket: AsyncSocket, buf: pointer, size: int,
proc recvInto*(socket: AsyncSocket, buf: pointer, size: int,
flags = {SocketFlag.SafeDisconn}): Future[int] {.async.} =
## Reads **up to** ``size`` bytes from ``socket`` into ``buf``.
##
@ -318,7 +318,7 @@ proc recv*(socket: AsyncSocket, size: int,
let read = readInto(addr result[0], size, socket, flags)
result.setLen(read)
proc sendBuffer*(socket: AsyncSocket, buf: pointer, size: int,
proc send*(socket: AsyncSocket, buf: pointer, size: int,
flags = {SocketFlag.SafeDisconn}) {.async.} =
## Sends ``size`` bytes from ``buf`` to ``socket``. The returned future will complete once all
## data has been sent.
@ -329,7 +329,7 @@ proc sendBuffer*(socket: AsyncSocket, buf: pointer, size: int,
sslWrite(socket.sslHandle, cast[cstring](buf), size.cint))
await sendPendingSslData(socket, flags)
else:
await sendBuffer(socket.fd.AsyncFD, buf, size, flags)
await send(socket.fd.AsyncFD, buf, size, flags)
proc send*(socket: AsyncSocket, data: string,
flags = {SocketFlag.SafeDisconn}) {.async.} =