[GNUnet-SVN] [gnunet-nim] 36/61: use immutable variables where possible

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to branch master
in repository gnunet-nim.

commit 238d9ae347ae3529f3f8fd9fe4c08aa3234cfc8a
Author: lurchi <address@hidden>
AuthorDate: Mon Aug 6 21:33:05 2018 +0200

    use immutable variables where possible
---
 asynccadet.nim         | 28 ++++++++++++++--------------
 gnunet_application.nim |  6 +++---
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/asynccadet.nim b/asynccadet.nim
index 51f6ae7..59c28ee 100644
--- a/asynccadet.nim
+++ b/asynccadet.nim
@@ -23,13 +23,13 @@ type
 
 proc channelDisconnectCb(cls: pointer,
                          gnunetChannel: ptr GNUNET_CADET_Channel) {.cdecl.} =
-  var channel = cast[ptr CadetChannel](cls)
+  let channel = cast[ptr CadetChannel](cls)
   channel.messages.complete()
 
 proc channelConnectCb(cls: pointer,
                       gnunetChannel: ptr GNUNET_CADET_Channel,
                       source: ptr GNUNET_PeerIdentity): pointer {.cdecl.} =
-  var port = cast[ptr CadetPort](cls)
+  let port = cast[ptr CadetPort](cls)
   let channel = new(CadetChannel)
   channel.handle = gnunetChannel
   channel.peer = GNUNET_PeerIdentity(public_key: source.public_key)
@@ -40,7 +40,7 @@ proc channelConnectCb(cls: pointer,
 
 proc channelMessageCb(cls: pointer,
                       messageHeader: ptr GNUNET_MessageHeader) {.cdecl.} =
-  var channel = cast[ptr CadetChannel](cls)
+  let channel = cast[ptr CadetChannel](cls)
   GNUNET_CADET_receive_done(channel.handle)
   let payloadLen = int(ntohs(messageHeader.size)) - 
sizeof(GNUNET_MessageHeader)
   let payload = cast[ptr 
GNUNET_MessageHeader](cast[ByteAddress](messageHeader) + 
sizeof(GNUNET_MessageHeader))
@@ -72,7 +72,7 @@ proc hashString(port: string): GNUNET_HashCode =
 proc sendMessage*(channel: ref CadetChannel, payload: string) =
   let messageLen = uint16(payload.len() + sizeof(GNUNET_MessageHeader))
   var messageHeader: ptr GNUNET_MessageHeader
-  var envelope = GNUNET_MQ_msg(addr messageHeader,
+  let envelope = GNUNET_MQ_msg(addr messageHeader,
                                messageLen,
                                GNUNET_MESSAGE_TYPE_CADET_CLI)
   messageHeader = cast[ptr 
GNUNET_MessageHeader](cast[ByteAddress](messageHeader) + 
sizeof(GNUNET_MessageHeader))
@@ -80,17 +80,17 @@ proc sendMessage*(channel: ref CadetChannel, payload: 
string) =
   GNUNET_MQ_send(GNUNET_CADET_get_mq(channel.handle), envelope)
 
 proc openPort*(handle: ref CadetHandle, port: string): ref CadetPort =
-  var handlers = messageHandlers()
-  var port = hashString(port)
-  var openPort = new(CadetPort)
+  let handlers = messageHandlers()
+  let port = hashString(port)
+  let openPort = new(CadetPort)
   openPort.channels = newFutureStream[ref CadetChannel]()
   openPort.handle = GNUNET_CADET_open_port(handle.handle,
-                                           addr port,
+                                           unsafeAddr port,
                                            channelConnectCb,
                                            addr openPort[],
                                            nil,
                                            channelDisconnectCb,
-                                           addr handlers[0])
+                                           unsafeAddr handlers[0])
   openPort.activeChannels = newSeq[ref CadetChannel]()
   handle.openPorts.add(openPort)
   return openPort
@@ -110,19 +110,19 @@ proc createChannel*(handle: ref CadetHandle,
   discard GNUNET_CRYPTO_eddsa_public_key_from_string(peer, #FIXME: don't 
discard
                                                      peer.len(),
                                                      addr 
peerIdentity.public_key)
-  var handlers = messageHandlers()
-  var port = hashString(port)
-  var channel = new(CadetChannel)
+  let handlers = messageHandlers()
+  let port = hashString(port)
+  let channel = new(CadetChannel)
   channel.peer = peerIdentity
   channel.messages = newFutureStream[string]("createChannel")
   channel.handle = GNUNET_CADET_channel_create(handle.handle,
                                                addr channel[],
                                                addr channel.peer,
-                                               addr port,
+                                               unsafeAddr port,
                                                GNUNET_CADET_OPTION_DEFAULT,
                                                nil,
                                                channelDisconnectCb,
-                                               addr handlers[0])
+                                               unsafeAddr handlers[0])
   return channel
 
 proc shutdownCb(cls: pointer) {.cdecl.} =
diff --git a/gnunet_application.nim b/gnunet_application.nim
index bcad17b..6c617fe 100644
--- a/gnunet_application.nim
+++ b/gnunet_application.nim
@@ -18,7 +18,7 @@ proc schedulerAdd(cls: pointer,
                   fdi: ptr GNUNET_SCHEDULER_FdInfo): cint {.cdecl.} =
   ## callback allowing GNUnet to add a file descriptor to the event loop
   type AddProc = proc(fd: AsyncFD, cb: proc(fd: AsyncFD): bool)
-  var app = cast[ptr GnunetApplication](cls)
+  let app = cast[ptr GnunetApplication](cls)
   debug("adding fd ", fdi.sock)
   let fd = AsyncFD(fdi.sock)
   proc addByInterest(interest: GNUNET_SCHEDULER_EventType, addProc: AddProc) : 
bool =
@@ -46,7 +46,7 @@ proc schedulerAdd(cls: pointer,
 proc schedulerDelete(cls: pointer,
                      task: ptr GNUNET_SCHEDULER_Task): cint {.cdecl.} =
   ## callback allowing GNUnet to delete a file descriptor from the event loop
-  var app = cast[ptr GnunetApplication](cls)
+  let app = cast[ptr GnunetApplication](cls)
   var fdi: ptr GNUNET_SCHEDULER_FdInfo
   if app.tasks.take(task, fdi):
     for v in app.tasks.values():
@@ -60,7 +60,7 @@ proc schedulerDelete(cls: pointer,
 proc schedulerSetWakeup(cls: pointer,
                         dt: GNUNET_TIME_Absolute) {.cdecl.} =
   ## callback allowing GNUnet to set a new wakeup time
-  var app = cast[ptr GnunetApplication](cls)
+  let app = cast[ptr GnunetApplication](cls)
   debug("setting new timeout: ", dt.abs_value_us)
   app.timeoutUs = dt.abs_value_us
 

-- 
To stop receiving notification emails like this one, please contact
address@hidden