From 38dd3b391f1adc584f5565abac5f24132ee9ac28 Mon Sep 17 00:00:00 2001
From: retropikzel <retropikzel@iki.fi>
Date: Fri, 25 Jul 2025 11:41:56 +0300
Subject: [PATCH] Improving error messages

---
 foreign/c.sld         |  3 +--
 foreign/c/pointer.scm | 14 ++++++--------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/foreign/c.sld b/foreign/c.sld
index 6996c69..e4f6ba8 100644
--- a/foreign/c.sld
+++ b/foreign/c.sld
@@ -147,8 +147,7 @@
                     cpointer-data-set!
                     cpointer-set!
                     cpointer-ref
-                    void?
-                    c-strlen))
+                    void?))
       (export ; calculate-struct-size-and-offsets
               ;struct-make
               get-environment-variable
diff --git a/foreign/c/pointer.scm b/foreign/c/pointer.scm
index 7d9baaa..9f3588d 100644
--- a/foreign/c/pointer.scm
+++ b/foreign/c/pointer.scm
@@ -74,14 +74,12 @@
   (lambda (bytevector-var)
     (c-strlen bytevector-var)))
 
-(define-syntax c-utf8->string
-  (syntax-rules ()
-    ((_ c-bytevector)
-     (begin
-       (when (c-null? c-bytevector)
-         (error "Can not turn null pointer into string" 'c-bytevector))
-       (let ((size (c-strlen c-bytevector)))
-         (utf8->string (c-bytevector->bytevector c-bytevector size)))))))
+(define c-utf8->string
+  (lambda (c-bytevector)
+    (when (c-null? c-bytevector)
+      (error "Can not turn null pointer into string" c-bytevector))
+    (let ((size (c-strlen c-bytevector)))
+      (utf8->string (c-bytevector->bytevector c-bytevector size)))))
 
 (define string->c-utf8
   (lambda (string-var)