Fix comparison for dereference

diff --git a/debian/changelog b/debian/changelog
index b8f44524f1c4619cc79b0b9147097a630010f833..f966a329473763b4ab63c0cf33ae1bdbe1487c44 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-uffi (2.1.2-1) unstable; urgency=low
+
+  * New upstream
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Tue, 20 Dec 2011 20:01:37 -0700
+

 cl-uffi (2.1.1-1) unstable; urgency=low
 
   * New upstream
 cl-uffi (2.1.1-1) unstable; urgency=low
 
   * New upstream

diff --git a/src/strings.lisp b/src/strings.lisp
index 834d251b2620ffc09888dfdb98507fc2924e42b6..430d8ab48d15c1b29c988108570867b41e487b89 100644 (file)
--- a/src/strings.lisp
+++ b/src/strings.lisp
@@ -393,13 +393,13 @@ that LW/CMU automatically converts strings from c-calls."
   `(new-ptr ,size)
   )
 
   `(new-ptr ,size)
   )
 

-(defmacro foreign-string-length (foreign-string)
-  #+allegro `(ff:foreign-strlen ,foreign-string)
+(defun foreign-string-length (foreign-string)
+  #+allegro (ff:foreign-strlen foreign-string)

   #-allegro
   #-allegro

-  `(loop
-      for size from 0
-      until (char= (deref-array ,foreign-string '(:array :unsigned-char) size) #\Null)
-      finally (return size)))
+  (loop
+     for size from 0
+     until (zerop (deref-array foreign-string '(:array :unsigned-char) size))
+     finally (return size)))

 
 
 (defmacro with-foreign-string ((foreign-string lisp-string &optional encoding)
 
 
 (defmacro with-foreign-string ((foreign-string lisp-string &optional encoding)