about summary refs log tree commit diff stats
path: root/src/local
diff options
context:
space:
mode:
authorbptato <nincsnevem662@gmail.com>2024-07-13 19:35:34 +0200
committerbptato <nincsnevem662@gmail.com>2024-07-13 19:51:42 +0200
commit224640dc58ee7a4837597ed7a10a17dac4d95629 (patch)
treed2a2b40081a65e49d23bfb4df2725236542e201c /src/local
parentbf231d2e50c342fdd688b7e944ff5c934610e08b (diff)
downloadchawan-224640dc58ee7a4837597ed7a10a17dac4d95629.tar.gz
32-bit compilation fixes
It seems registerHandle/unregister doesn't accept cint as handles. Not
sure why it even works on 64-bit targets... (maybe some converter
weirdness?)

Seems best to explicitly cast it away.
Diffstat (limited to 'src/local')
-rw-r--r--src/local/client.nim2
-rw-r--r--src/local/pager.nim16
2 files changed, 9 insertions, 9 deletions
diff --git a/src/local/client.nim b/src/local/client.nim
index 7a218a11..a852d8cd 100644
--- a/src/local/client.nim
+++ b/src/local/client.nim
@@ -405,7 +405,7 @@ proc acceptBuffers(client: Client) =
     elif (let i = pager.findConnectingContainer(container); i != -1):
       # connecting to URL
       let stream = pager.connectingContainers[i].stream
-      client.selector.unregister(stream.fd)
+      client.selector.unregister(int(stream.fd))
       stream.sclose()
       pager.connectingContainers.del(i)
   let registerFun = proc(fd: int) =
diff --git a/src/local/pager.nim b/src/local/pager.nim
index 765bb89d..dfa7d014 100644
--- a/src/local/pager.nim
+++ b/src/local/pager.nim
@@ -1937,6 +1937,10 @@ proc connected(pager: Pager; container: Container; response: Response) =
     pager.deleteContainer(container, container.find(ndAny))
     pager.refreshStatusMsg()
 
+proc unregisterFd(pager: Pager; fd: int) =
+  pager.selector.unregister(fd)
+  pager.loader.unregistered.add(fd)
+
 # true if done, false if keep
 proc handleConnectingContainer*(pager: Pager; i: int) =
   let item = pager.connectingContainers[i]
@@ -1961,8 +1965,7 @@ proc handleConnectingContainer*(pager: Pager; i: int) =
       pager.fail(container, msg)
       # done
       pager.connectingContainers.del(i)
-      pager.selector.unregister(item.stream.fd)
-      pager.loader.unregistered.add(item.stream.fd)
+      pager.unregisterFd(int(item.stream.fd))
       stream.sclose()
   of ccsBeforeStatus:
     var r = stream.initPacketReader()
@@ -1981,8 +1984,7 @@ proc handleConnectingContainer*(pager: Pager; i: int) =
     r.sread(response.headers)
     # done
     pager.connectingContainers.del(i)
-    pager.selector.unregister(item.stream.fd)
-    pager.loader.unregistered.add(item.stream.fd)
+    pager.unregisterFd(int(item.stream.fd))
     let redirect = response.getRedirect(container.request)
     if redirect != nil:
       stream.sclose()
@@ -1993,8 +1995,7 @@ proc handleConnectingContainer*(pager: Pager; i: int) =
 proc handleConnectingContainerError*(pager: Pager; i: int) =
   let item = pager.connectingContainers[i]
   pager.fail(item.container, "loader died while loading")
-  pager.selector.unregister(item.stream.fd)
-  pager.loader.unregistered.add(item.stream.fd)
+  pager.unregisterFd(int(item.stream.fd))
   item.stream.sclose()
   pager.connectingContainers.del(i)
 
@@ -2067,8 +2068,7 @@ proc handleEvent0(pager: Pager; container: Container; event: ContainerEvent):
       dec pager.numload
       pager.deleteContainer(container, container.find(ndAny))
       pager.connectingContainers.del(i)
-      pager.selector.unregister(item.stream.fd)
-      pager.loader.unregistered.add(item.stream.fd)
+      pager.unregisterFd(int(item.stream.fd))
       item.stream.sclose()
   return true