logos-storage/nim-chronos
1
0
Fork 0
mirror of https://github.com/logos-storage/nim-chronos.git synced 2026-01-04 22:43:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation errors with --styleCheck:usages --styleCheck:error

Browse Source
This commit is contained in:
Zahary Karadjov 2021-12-08 16:58:24 +02:00
parent cedc603b81
commit 7ca85ddadc
No known key found for this signature in database
GPG Key ID: C8936F8A3073D609
6 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
chronos/asyncloop.nim
View File

@ -563,7 +563,7 @@ elif unixPlatform:
## Unregister file descriptor ``fd`` from thread's dispatcher.
getThreadDispatcher().selector.unregister(int(fd))
proc contains*(disp: PDispatcher, fd: AsyncFd): bool {.inline.} =
proc contains*(disp: PDispatcher, fd: AsyncFD): bool {.inline.} =
## Returns ``true`` if ``fd`` is registered in thread's dispatcher.
result = int(fd) in disp.selector
@ -770,7 +770,7 @@ proc getThreadDispatcher*(): PDispatcher =
setThreadDispatcher(newDispatcher())
except CatchableError as exc:
raiseAsDefect exc, "Cannot create dispatcher"
gdisp
gDisp
proc setGlobalDispatcher*(disp: PDispatcher) {.
gcsafe, deprecated: "Use setThreadDispatcher() instead".} =

2
chronos/handles.nim
View File

@ -88,7 +88,7 @@ proc getSockOpt*(socket: AsyncFD, level, optname: int, value: pointer,
## `getsockopt()` for custom options (pointer and length).
## Returns ``true`` on success, ``false`` on error.
getsockopt(SocketHandle(socket), cint(level), cint(optname),
value, cast[ptr Socklen](addr valuelen)) >= cint(0)
value, cast[ptr SockLen](addr valuelen)) >= cint(0)
proc getSocketError*(socket: AsyncFD, err: var int): bool =
## Recover error code associated with socket handle ``socket``.

4
chronos/streams/chunkstream.nim
View File

@ -48,7 +48,7 @@ proc hexValue*(c: byte): int =
((z + 11'u32) and -LT(z, 6))
int(r) - 1
proc getChunkSize(buffer: openarray[byte]): Result[uint64, cstring] =
proc getChunkSize(buffer: openArray[byte]): Result[uint64, cstring] =
# We using `uint64` representation, but allow only 2^32 chunk size,
# ChunkHeaderValueSize.
var res = 0'u64
@ -66,7 +66,7 @@ proc getChunkSize(buffer: openarray[byte]): Result[uint64, cstring] =
res = (res shl 4) or uint64(value)
ok(res)
proc setChunkSize(buffer: var openarray[byte], length: int64): int =
proc setChunkSize(buffer: var openArray[byte], length: int64): int =
# Store length as chunk header size (hexadecimal value) with CRLF.
# Maximum stored value is ``0xFFFF_FFFF``.
# Buffer ``buffer`` length must be at least 10 octets.

12
chronos/transports/common.nim
View File

@ -301,7 +301,7 @@ proc getAddrInfo(address: string, port: Port, domain: Domain,
raise newException(TransportAddressError, $gai_strerror(gaiRes))
res
proc fromSAddr*(sa: ptr Sockaddr_storage, sl: Socklen,
proc fromSAddr*(sa: ptr Sockaddr_storage, sl: SockLen,
address: var TransportAddress) =
## Set transport address ``address`` with value from OS specific socket
## address storage.
@ -333,19 +333,19 @@ proc fromSAddr*(sa: ptr Sockaddr_storage, sl: Socklen,
discard
proc toSAddr*(address: TransportAddress, sa: var Sockaddr_storage,
sl: var Socklen) =
sl: var SockLen) =
## Set socket OS specific socket address storage with address from transport
## address ``address``.
case address.family
of AddressFamily.IPv4:
sl = Socklen(sizeof(Sockaddr_in))
sl = SockLen(sizeof(Sockaddr_in))
let s = cast[ptr Sockaddr_in](addr sa)
s.sin_family = type(s.sin_family)(toInt(Domain.AF_INET))
s.sin_port = nativesockets.htons(uint16(address.port))
copyMem(addr s.sin_addr, unsafeAddr address.address_v4[0],
sizeof(s.sin_addr))
of AddressFamily.IPv6:
sl = Socklen(sizeof(Sockaddr_in6))
sl = SockLen(sizeof(Sockaddr_in6))
let s = cast[ptr Sockaddr_in6](addr sa)
s.sin6_family = type(s.sin6_family)(toInt(Domain.AF_INET6))
s.sin6_port = nativesockets.htons(uint16(address.port))
@ -354,11 +354,11 @@ proc toSAddr*(address: TransportAddress, sa: var Sockaddr_storage,
of AddressFamily.Unix:
when not defined(windows):
if address.port == Port(0):
sl = Socklen(sizeof(sa.ss_family))
sl = SockLen(sizeof(sa.ss_family))
else:
let s = cast[ptr Sockaddr_un](addr sa)
var name = cast[cstring](unsafeAddr address.address_un[0])
sl = Socklen(sizeof(sa.ss_family) + len(name) + 1)
sl = SockLen(sizeof(sa.ss_family) + len(name) + 1)
s.sun_family = type(s.sun_family)(toInt(Domain.AF_UNIX))
copyMem(addr s.sun_path, unsafeAddr address.address_un[0],
len(name) + 1)

32
chronos/transports/osnet.nim
View File

@ -621,7 +621,7 @@ when defined(linux):
var res = posix.socket(AF_NETLINK, posix.SOCK_DGRAM, NETLINK_ROUTE)
if res != SocketHandle(-1):
if posix.bindSocket(res, cast[ptr SockAddr](addr address),
Socklen(sizeof(SockAddr_nl))) != 0:
SockLen(sizeof(SockAddr_nl))) != 0:
discard posix.close(res)
res = SocketHandle(-1)
res
@ -648,7 +648,7 @@ when defined(linux):
rmsg.msg_iov = addr iov
rmsg.msg_iovlen = 1
rmsg.msg_name = cast[pointer](addr address)
rmsg.msg_namelen = Socklen(sizeof(SockAddr_nl))
rmsg.msg_namelen = SockLen(sizeof(SockAddr_nl))
let res = posix.sendmsg(fd, addr rmsg, 0).TIovLen
(res == iov.iov_len)
@ -663,7 +663,7 @@ when defined(linux):
type TIovLen = type iov.iov_len
var req = cast[ptr NlRouteReq](addr buffer[0])
var req = cast[ptr NLRouteReq](addr buffer[0])
address.family = cushort(AF_NETLINK)
req.hdr.nlmsg_len = NLMSG_LENGTH(sizeof(RtMessage))
@ -696,7 +696,7 @@ when defined(linux):
rmsg.msg_iov = addr iov
rmsg.msg_iovlen = 1
rmsg.msg_name = cast[pointer](addr address)
rmsg.msg_namelen = Socklen(sizeof(SockAddr_nl))
rmsg.msg_namelen = SockLen(sizeof(SockAddr_nl))
let res = posix.sendmsg(fd, addr rmsg, 0).TIovLen
(res == iov.iov_len)
@ -1093,19 +1093,19 @@ elif defined(macosx) or defined(bsd):
res[i].mtu = cast[int](data.ifi_mtu)
elif family == posix.AF_INET:
fromSAddr(cast[ptr Sockaddr_storage](ifap.ifa_addr),
Socklen(sizeof(SockAddr_in)), ifaddress.host)
SockLen(sizeof(SockAddr_in)), ifaddress.host)
elif family == posix.AF_INET6:
fromSAddr(cast[ptr Sockaddr_storage](ifap.ifa_addr),
Socklen(sizeof(SockAddr_in6)), ifaddress.host)
SockLen(sizeof(SockAddr_in6)), ifaddress.host)
if not isNil(ifap.ifa_netmask):
var na: TransportAddress
var family = cast[cint](ifap.ifa_netmask.sa_family)
if family == posix.AF_INET:
fromSAddr(cast[ptr Sockaddr_storage](ifap.ifa_netmask),
Socklen(sizeof(SockAddr_in)), na)
SockLen(sizeof(SockAddr_in)), na)
elif family == posix.AF_INET6:
fromSAddr(cast[ptr Sockaddr_storage](ifap.ifa_netmask),
Socklen(sizeof(SockAddr_in6)), na)
SockLen(sizeof(SockAddr_in6)), na)
ifaddress.net = IpNet.init(ifaddress.host, na)
if ifaddress.host.family != AddressFamily.None:
@ -1146,7 +1146,7 @@ elif defined(macosx) or defined(bsd):
if sock != -1:
var sastore: Sockaddr_storage
var salen: Socklen
var salen: SockLen
address.toSAddr(sastore, salen)
# We doing this trick because Nim's posix declaration of Sockaddr_storage
# is not compatible with BSD version. First byte in BSD version is length
@ -1181,9 +1181,9 @@ elif defined(macosx) or defined(bsd):
var saddr = cast[ptr Sockaddr_storage](addr msg.space[so])
let size = sasize(msg.space.toOpenArray(so, eo))
if mask == RTA_DST:
fromSAddr(saddr, Socklen(size), res.dest)
fromSAddr(saddr, SockLen(size), res.dest)
elif mask == RTA_GATEWAY:
fromSAddr(saddr, Socklen(size), res.gateway)
fromSAddr(saddr, SockLen(size), res.gateway)
so += size
if res.dest.isZero():
@ -1513,7 +1513,7 @@ elif defined(windows):
var empty: TransportAddress
var dest, src: Sockaddr_storage
var luid: uint64
var destlen: Socklen
var destlen: SockLen
address.toSAddr(dest, destlen)
var getBestRoute2 = cast[GETBESTROUTE2](symAddr(iph, "GetBestRoute2"))
var gres = getBestRoute2(addr luid, 0'u32, nil,
@ -1523,15 +1523,15 @@ elif defined(windows):
cast[ptr SOCKADDR_INET](addr src))
if gres == 0:
if src.ss_family == winlean.AF_INET:
fromSAddr(addr src, Socklen(sizeof(Sockaddr_in)), res.source)
fromSAddr(addr src, SockLen(sizeof(Sockaddr_in)), res.source)
elif src.ss_family == winlean.AF_INET6:
fromSAddr(addr src, Socklen(sizeof(Sockaddr_in6)), res.source)
fromSAddr(addr src, SockLen(sizeof(Sockaddr_in6)), res.source)
if bestRoute.nextHop.si_family == winlean.AF_INET:
fromSAddr(cast[ptr Sockaddr_storage](addr bestRoute.nextHop),
Socklen(sizeof(Sockaddr_in)), res.gateway)
SockLen(sizeof(Sockaddr_in)), res.gateway)
elif bestRoute.nextHop.si_family == winlean.AF_INET6:
fromSAddr(cast[ptr Sockaddr_storage](addr bestRoute.nextHop),
Socklen(sizeof(Sockaddr_in6)), res.gateway)
SockLen(sizeof(Sockaddr_in6)), res.gateway)
if res.gateway.isZero():
res.gateway = empty
res.dest = address

4
chronos/transports/stream.nim
View File

@ -61,7 +61,7 @@ type
opened*: int64
closed*: int64
ReadMessagePredicate* = proc (data: openarray[byte]): tuple[consumed: int,
ReadMessagePredicate* = proc (data: openArray[byte]): tuple[consumed: int,
done: bool] {.
gcsafe, raises: [Defect].}
@ -2415,7 +2415,7 @@ proc readMessage*(transp: StreamTransport,
##
## ``predicate`` callback must copy all the data from ``data`` array and
## return number of bytes it is going to consume.
## ``predicate`` callback will receive (zero-length) openarray, if transport
## ``predicate`` callback will receive (zero-length) openArray, if transport
## is at EOF.
readLoop("stream.transport.readMessage"):
if transp.offset == 0: