From 0359d19e7bc7bc6311e0ffdf93773b4c2752a6cc Mon Sep 17 00:00:00 2001
From: pablo
Date: Fri, 9 Jan 2026 11:29:14 +0200
Subject: [PATCH] fix: pr comments
---
examples/cbindings/cbindings_chat_tui.c | 4 ++--
library/api/client_api.nim | 10 ++++-----
library/api/conversation_api.nim | 6 ++---
library/api/identity_api.nim | 8 +++----
library/declare_lib.nim | 2 +-
library/libchat.nim | 14 ++++++------
library/utils.nim | 29 +------------------------
7 files changed, 23 insertions(+), 50 deletions(-)
diff --git a/examples/cbindings/cbindings_chat_tui.c b/examples/cbindings/cbindings_chat_tui.c
index 9043f3e..faffbe4 100644
--- a/examples/cbindings/cbindings_chat_tui.c
+++ b/examples/cbindings/cbindings_chat_tui.c
@@ -537,8 +537,8 @@ static void process_input_char(int ch) {
}
break;
case KEY_BACKSPACE:
- case 127:
- case 8:
+ case 127: // DEL
+ case 8: // BS
if (inp->pos > 0) {
memmove(inp->buffer + inp->pos - 1, inp->buffer + inp->pos, inp->len - inp->pos + 1);
inp->pos--;
diff --git a/library/api/client_api.nim b/library/api/client_api.nim
index 0ff2bf2..71c2827 100644
--- a/library/api/client_api.nim
+++ b/library/api/client_api.nim
@@ -6,11 +6,11 @@ import chronicles
import chronos
import ffi
-import ../../src/chat
-import ../../src/chat/proto_types
-import ../../src/chat/delivery/waku_client
-import ../../src/chat/identity
-import ../utils
+import src/chat
+import src/chat/proto_types
+import src/chat/delivery/waku_client
+import src/chat/identity
+import library/utils
logScope:
topics = "chat ffi client"
diff --git a/library/api/conversation_api.nim b/library/api/conversation_api.nim
index 3d8b153..79779f4 100644
--- a/library/api/conversation_api.nim
+++ b/library/api/conversation_api.nim
@@ -7,9 +7,9 @@ import chronos
import ffi
import stew/byteutils
-import ../../src/chat
-import ../../src/chat/proto_types
-import ../utils
+import src/chat
+import src/chat/proto_types
+import library/utils
logScope:
topics = "chat ffi conversation"
diff --git a/library/api/identity_api.nim b/library/api/identity_api.nim
index bb903d8..6d2ccdb 100644
--- a/library/api/identity_api.nim
+++ b/library/api/identity_api.nim
@@ -7,10 +7,10 @@ import chronos
import ffi
import stew/byteutils
-import ../../src/chat
-import ../../src/chat/crypto
-import ../../src/chat/proto_types
-import ../utils
+import src/chat
+import src/chat/crypto
+import src/chat/proto_types
+import library/utils
logScope:
topics = "chat ffi identity"
diff --git a/library/declare_lib.nim b/library/declare_lib.nim
index ea950cb..c6d1aa4 100644
--- a/library/declare_lib.nim
+++ b/library/declare_lib.nim
@@ -1,5 +1,5 @@
import ffi
-import ../src/chat/client
+import src/chat/client
declareLibrary("chat")
diff --git a/library/libchat.nim b/library/libchat.nim
index 93844b7..9437f7c 100644
--- a/library/libchat.nim
+++ b/library/libchat.nim
@@ -9,13 +9,13 @@ import chronicles, chronos, ffi
import stew/byteutils
import
- ../src/chat/client,
- ../src/chat/conversations,
- ../src/chat/identity,
- ../src/chat/delivery/waku_client,
- ../src/chat/proto_types,
- ./declare_lib,
- ./utils
+ src/chat/client,
+ src/chat/conversations,
+ src/chat/identity,
+ src/chat/delivery/waku_client,
+ src/chat/proto_types,
+ library/declare_lib,
+ library/utils
logScope:
topics = "chat ffi"
diff --git a/library/utils.nim b/library/utils.nim
index 5c342f7..5361fd0 100644
--- a/library/utils.nim
+++ b/library/utils.nim
@@ -1,34 +1,7 @@
## Utility functions for C-bindings
-## Provides C-string helpers and JSON event serialization
+## Provides JSON event serialization helpers
import std/json
-import ffi
-
-# Re-export common FFI types
-export ffi
-
-#################################################
-# C-String Helpers
-#################################################
-
-proc toCString*(s: string): cstring =
- ## Convert Nim string to C string (caller must manage memory)
- result = s.cstring
-
-proc fromCString*(cs: cstring): string =
- ## Convert C string to Nim string (makes a copy)
- if cs.isNil:
- result = ""
- else:
- result = $cs
-
-proc toBytes*(data: ptr byte, len: csize_t): seq[byte] =
- ## Convert C byte array to Nim seq[byte]
- if data.isNil or len == 0:
- result = @[]
- else:
- result = newSeq[byte](len)
- copyMem(addr result[0], data, len)
#################################################
# JSON Event Types