r1529: *** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index f5fc9452c6fd595220aecd67a7c63a900aa9a70e..2e92fe1f2c65ce1c21263cf75dd14d08f2cb3bec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,19 +1,23 @@
+10 Mar 2002
+       * Made Allegro CL array access more efficient
+       * Renamed c-string to cstring to emphasize it as a basic type
+       
 9 Mar 2002
-       - Changed def-routine name to def-function
-       - Fixed bug in def-function for Lispworks
-       - Fixed error in +null-c-string-pointer+ name
-       - Fixed error in (make-null-pointer) for Lispworks
-       - Reworked Lispwork c-strings to be (* :char) rather than
+       * Changed def-routine name to def-function
+       * Fixed bug in def-function for Lispworks
+       * Fixed error in +null-c-string-pointer+ name
+       * Fixed error in (make*null*pointer) for Lispworks
+       * Reworked Lispwork c-strings to be (* :char) rather than
        the implementation default of (* (:unsigned :char)) to be
        consistent with CMUCL. Bumped version to 0.2.0 because of
        change this change.
-       - Modified getenv.cl example to avoid name collison with LW
-       - Modified compress.cl to setup output buffer as :unsigned-char
-       - Added test-all-examples function. All routines tested
+       * Modified getenv.cl example to avoid name collison with LW
+       * Modified compress.cl to setup output buffer as :unsigned*char
+       * Added test*all*examples function. All routines tested
        okay with ACL, LW, and CMUCL
        
 8 Mar 2002
-       - Added ZIP file output with LF->CRLF translations to distribution
-       - Modified def-enum to use uffi:def-constant rather than
+       * Added ZIP file output with LF->CRLF translations to distribution
+       * Modified def*enum to use uffi:def*constant rather than
        cl:defconstant
        

diff --git a/Makefile b/Makefile
index 8f79c9671e7485f1dd5c88169372a89fdc31fb3a..02bfae93d13844c0dffb099ee5ba6e1b1edd15b8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@
 #  Programer:    Kevin M. Rosenberg, M.D.
 #  Date Started: Mar 2002
 #
-#  CVS Id:   $Id: Makefile,v 1.7 2002/03/10 05:13:09 kevin Exp $
+#  CVS Id:   $Id: Makefile,v 1.8 2002/03/10 11:13:07 kevin Exp $
 #
 #  Copyright (c) 2002 by Kevin M. Rosenberg
 #
@@ -41,12 +41,12 @@ realclean: clean
 docs:
        @(cd doc; make dist-doc)
 
-VERSION=0.2.0
+VERSION=0.2.1
 DISTDIR=uffi-${VERSION}
 DIST_TARBALL=${DISTDIR}.tar.gz
 DIST_ZIP=${DISTDIR}.zip
 SOURCE_FILES=src doc examples Makefile COPYING COPYRIGHT README \
-        INSTALL uffi.lsm ChangeLog NEWS
+        INSTALL uffi.lsm ChangeLog NEWS test-all-examples.cl
 
 dist: realclean docs
        @rm -fr ${DISTDIR} ${DIST_TARBALL} ${DIST_ZIP}

diff --git a/doc/ref.sgml b/doc/ref.sgml
index 5b783d3482ad5661f729cb1773c835b417f006bd..a0d77f11323fbdd10c7ad682704588ad9bb5998e 100644 (file)
--- a/doc/ref.sgml
+++ b/doc/ref.sgml
@@ -165,7 +165,7 @@
        </para>
       </sect2>
       <sect2>
-       <title>+null-c-string-ptr+</title>
+       <title>+null-cstring-ptr+</title>
        <para>
          A constant returning a &null; character pointer;
        </para>
@@ -175,31 +175,31 @@
     <sect1>
       <title>Strings</title>
       <sect2>
-       <title>convert-from-c-string</title>
+       <title>convert-from-cstring</title>
        <para>
-         Converts a Lisp string to a <varname>c-string</varname>.
+         Converts a Lisp string to a <varname>cstring</varname>.
        </para>
       </sect2>
       <sect2>
-       <title>convert-to-c-string</title>
+       <title>convert-to-cstring</title>
        <para>
          Converts a Lisp string to a
-         <varname>c-string</varname>. These
-         <varname>c-string's</varname> should be freed with
-         <function>free-c-string</function>.
+         <varname>cstring</varname>. These
+         <varname>cstring's</varname> should be freed with
+         <function>free-cstring</function>.
        </para>
       </sect2>
       <sect2>
-       <title>free-c-string</title>
+       <title>free-cstring</title>
        <para>
          Frees any memory possibly allocated by
-         <function>convert-to-c-string</function>.
+         <function>convert-to-cstring</function>.
        </para>
       </sect2>
       <sect2>
-       <title>with-c-string</title>
+       <title>with-cstring</title>
        <para>
-         Binds a lexical variable to a newly allocated <varname>c-string</varname>. Automatically frees <varname>c-string</varname>.
+         Binds a lexical variable to a newly allocated <varname>cstring</varname>. Automatically frees <varname>cstring</varname>.
        </para>
       </sect2>
       <sect2>

diff --git a/examples/compress.cl b/examples/compress.cl
index 640ce26ab2f63aa18f2302cb8ef86bff8b454543..4cb184f6299239d0240ac1b743329a9710f05960 100644 (file)
--- a/examples/compress.cl
+++ b/examples/compress.cl
@@ -9,7 +9,7 @@
 ;;;;
 ;;;; Copyright (c) 2002 Kevin M. Rosenberg
 ;;;;
-;;;; $Id: compress.cl,v 1.4 2002/03/10 05:09:00 kevin Exp $
+;;;; $Id: compress.cl,v 1.5 2002/03/10 11:13:07 kevin Exp $
 ;;;;
 ;;;; This file is part of UFFI. 
 ;;;;
@@ -35,7 +35,7 @@
 (uffi:def-function ("compress" c-compress)
     ((dest (* :unsigned-char))
      (destlen (* :long))
-     (source :c-string)
+     (source :cstring)
      (source-len :long))
   :returning :int
   :module "zlib")
@@ -48,7 +48,7 @@
         (dest (uffi:allocate-foreign-string destsize :unsigned t))
         (destlen (uffi:allocate-foreign-object :long)))
     (setf (uffi:deref-pointer destlen :long) destsize)
-    (uffi:with-c-string (source-native source)
+    (uffi:with-cstring (source-native source)
       (let ((result (c-compress dest destlen source-native sourcelen))
            (newdestlen (uffi:deref-pointer destlen :long)))
        (unwind-protect

diff --git a/examples/getenv.cl b/examples/getenv.cl
index 2f83426f11885b49601999ad5ba3904a3d41ace9..c6da2a0c9bff1cefaaa8014f708f7e920feae498 100644 (file)
--- a/examples/getenv.cl
+++ b/examples/getenv.cl
@@ -9,7 +9,7 @@
 ;;;;
 ;;;; Copyright (c) 2002 Kevin M. Rosenberg
 ;;;;
-;;;; $Id: getenv.cl,v 1.4 2002/03/10 05:13:09 kevin Exp $
+;;;; $Id: getenv.cl,v 1.5 2002/03/10 11:13:07 kevin Exp $
 ;;;;
 ;;;; This file is part of UFFI. 
 ;;;;
@@ -31,15 +31,15 @@
 
 
 (uffi:def-function ("getenv" c-getenv) 
-    ((name :c-string))
-  :returning :c-string)
+    ((name :cstring))
+  :returning :cstring)
 
 (defun my-getenv (key)
   "Returns an environment variable, or NIL if it does not exist"
   (check-type key string)
-  (uffi:with-c-string (key-native key)
-    (let ((value-c-string (c-getenv key-native)))
-      (uffi:convert-from-c-string value-c-string))))
+  (uffi:with-cstring (key-native key)
+    (let ((value-cstring (c-getenv key-native)))
+      (uffi:convert-from-cstring value-cstring))))
     
 #+test-uffi
 (progn

diff --git a/examples/gethostname.cl b/examples/gethostname.cl
index fbb3539a6230914c3bd717bc992ece1e95c4f292..125b83ab5c4a481d3fb75b3733d9476aa19d4d2b 100644 (file)
--- a/examples/gethostname.cl
+++ b/examples/gethostname.cl
@@ -9,7 +9,7 @@
 ;;;;
 ;;;; Copyright (c) 2002 Kevin M. Rosenberg
 ;;;;
-;;;; $Id: gethostname.cl,v 1.3 2002/03/10 04:15:33 kevin Exp $
+;;;; $Id: gethostname.cl,v 1.4 2002/03/10 11:13:07 kevin Exp $
 ;;;;
 ;;;; This file is part of UFFI. 
 ;;;;
@@ -33,7 +33,7 @@
 ;;; This example is inspired by the example on the CL-Cookbook web site
 
 (uffi:def-function ("gethostname" c-gethostname) 
-    ((name :c-string)
+    ((name :cstring)
      (len :int))
   :returning :int)
 

diff --git a/examples/getshells.cl b/examples/getshells.cl
index 50040ec99b4db81dd1e352f7286256b18cedffea..7bab9cac78b90fdc69e500a3bd34043ecc6e43dd 100644 (file)
--- a/examples/getshells.cl
+++ b/examples/getshells.cl
@@ -9,7 +9,7 @@
 ;;;;
 ;;;; Copyright (c) 2002 Kevin M. Rosenberg
 ;;;;
-;;;; $Id: getshells.cl,v 1.3 2002/03/10 04:15:33 kevin Exp $
+;;;; $Id: getshells.cl,v 1.4 2002/03/10 11:13:07 kevin Exp $
 ;;;;
 ;;;; This file is part of UFFI. 
 ;;;;
@@ -40,14 +40,14 @@
 
 (uffi:def-function "getusershell"
     nil
-  :returning :c-string)
+  :returning :cstring)
 
 (defun getshells ()
   "Returns list of valid shells"
   (setusershell)
   (let (shells)
-    (do ((shell (uffi:convert-from-c-string (getusershell))
-                (uffi:convert-from-c-string (getusershell))))
+    (do ((shell (uffi:convert-from-cstring (getusershell))
+                (uffi:convert-from-cstring (getusershell))))
        ((null shell))
       (push shell shells))
     (endusershell)

diff --git a/examples/strtol.cl b/examples/strtol.cl
index 98131602bc57d65629c8d1e479011af10d08c905..518eb2909fa102b95ef93f48a3e7136199d98bd3 100644 (file)
--- a/examples/strtol.cl
+++ b/examples/strtol.cl
@@ -9,7 +9,7 @@
 ;;;;
 ;;;; Copyright (c) 2002 Kevin M. Rosenberg
 ;;;;
-;;;; $Id: strtol.cl,v 1.5 2002/03/10 05:09:00 kevin Exp $
+;;;; $Id: strtol.cl,v 1.6 2002/03/10 11:13:07 kevin Exp $
 ;;;;
 ;;;; This file is part of UFFI. 
 ;;;;
@@ -31,7 +31,7 @@
 
 (uffi:def-type char-ptr (* :char))
   
-;; This example does not use :c-string to pass the input string since
+;; This example does not use :cstring to pass the input string since
 ;; the routine needs to do pointer arithmetic to see how many characters
 ;; were parsed
 

diff --git a/src/aggregates.cl b/src/aggregates.cl
index b0438d9a4c501e9756b3113ae71e2d7ce1f50479..bf163c892a254c4d76a8b20ba20488814cfd7685 100644 (file)
--- a/src/aggregates.cl
+++ b/src/aggregates.cl
@@ -9,7 +9,7 @@
 ;;;;
 ;;;; Copyright (c) 2002 Kevin M. Rosenberg
 ;;;;
-;;;; $Id: aggregates.cl,v 1.1 2002/03/09 19:55:33 kevin Exp $
+;;;; $Id: aggregates.cl,v 1.2 2002/03/10 11:13:07 kevin Exp $
 ;;;;
 ;;;; This file is part of the UFFI. 
 ;;;;
@@ -62,7 +62,7 @@ of the enum-name name, separator-string, and field-name"
 (defmacro def-array (name-array type)
   #+allegro
   `(ff:def-foreign-type ,name-array 
-       (:struct (:my-field (:array ,(convert-from-uffi-type type :array)))))
+       (:array ,(convert-from-uffi-type type :array)))
   #+lispworks
   `(fli:define-c-typedef ,name-array
        (:pointer (:pointer ,(convert-from-uffi-type type :array))))
@@ -120,7 +120,7 @@ of the enum-name name, separator-string, and field-name"
   #+(or lispworks cmu) (declare (ignore type))
   #+cmu  `(alien:deref ,obj ,i)
   #+lispworks `(fli:dereference ,obj :index ,i)
-  #+allegro `(ff:fslot-value-typed ,type :c ,obj ':my-field ,i)
+  #+allegro `(ff:fslot-value-typed ,type :c ,obj ,i)
   )
 
 

diff --git a/src/immediates.cl b/src/immediates.cl
index 62e216f1c1fc5382fe5fd03aa43889d751655e81..ae1013cf412a90ae758bf9d02485ecf9f983648e 100644 (file)
--- a/src/immediates.cl
+++ b/src/immediates.cl
@@ -9,7 +9,7 @@
 ;;;;
 ;;;; Copyright (c) 2002 Kevin M. Rosenberg
 ;;;;
-;;;; $Id: immediates.cl,v 1.2 2002/03/10 05:09:00 kevin Exp $
+;;;; $Id: immediates.cl,v 1.3 2002/03/10 11:13:07 kevin Exp $
 ;;;;
 ;;;; This file is part of the UFFI. 
 ;;;;
@@ -89,7 +89,7 @@ supports this."
     '((* . *) (:void . c-call:void) 
       (:short . c-call:short)
       (:pointer-void . (* t))
-      (:c-string . c-call:c-string)
+      (:cstring . c-call:cstring)
       (:char . c-call:char) (:unsigned-char . (alien:unsigned 8))
       (:int . alien:integer) (:unsigned-int . c-call:unsigned-int) 
       (:long . c-call:long) (:unsigned-long . c-call:unsigned-long)
@@ -100,7 +100,7 @@ supports this."
     '((* . *) (:void . :void)
       (:short . :short)
       (:pointer-void . (* :void))
-      (:c-string . (* :char))
+      (:cstring . (* :char))
       (:char . :char) (:unsigned-char . :unsigned-char)
       (:int . :int) (:unsigned-int . :unsigned-int) 
       (:long . :long) (:unsigned-long . :unsigned-long)
@@ -111,7 +111,7 @@ supports this."
     '((* . :pointer) (:void . :void) 
       (:short . :short)
       (:pointer-void . (:pointer :void))
-      (:c-string . (:pointer :char))
+      (:cstring . (:pointer :char))
       (:char . :char) (:unsigned-char . (:unsigned :char))
       (:int . :int) (:unsigned-int . (:unsigned :int))
       (:long . :long) (:unsigned-long . (:unsigned :long))
@@ -134,7 +134,7 @@ supports this."
       (cond
        #+allegro 
        ((and (or (eq context :routine) (eq context :return))
-            (eq type :c-string))
+            (eq type :cstring))
        (setq type '((* :char) integer)))
        #+cmu 
        ((eq context :type)

diff --git a/src/objects.cl b/src/objects.cl
index 6167636a7fb1c57a36f9893215788d0ddb73bdf4..a4b4a6ec2ba5a82641f25b5c0e57819a1ccb663e 100644 (file)
--- a/src/objects.cl
+++ b/src/objects.cl
@@ -9,7 +9,7 @@
 ;;;;
 ;;;; Copyright (c) 2002 Kevin M. Rosenberg
 ;;;;
-;;;; $Id: objects.cl,v 1.2 2002/03/10 00:11:47 kevin Exp $
+;;;; $Id: objects.cl,v 1.3 2002/03/10 11:13:07 kevin Exp $
 ;;;;
 ;;;; This file is part of the UFFI. 
 ;;;;
@@ -54,10 +54,6 @@
   #+cmu   `(alien:null-alien ,obj)
   )
 
-(def-constant +null-c-string-pointer+
-    #+cmu nil
-    #+allegro 0
-    #+lispworks (fli:make-pointer :address 0 :type '(:unsigned :char)))
 
 (defmacro make-null-pointer (type)
   #+(or allegro cmu) (declare (ignore type))

diff --git a/src/strings.cl b/src/strings.cl
index 0e1e20de513da50e414010a83c03e8768f46dad6..0f0c54cfef695065f72a45ee6ffca455a34f8eda 100644 (file)
--- a/src/strings.cl
+++ b/src/strings.cl
@@ -9,7 +9,7 @@
 ;;;;
 ;;;; Copyright (c) 2002 Kevin M. Rosenberg
 ;;;;
-;;;; $Id: strings.cl,v 1.3 2002/03/10 05:09:00 kevin Exp $
+;;;; $Id: strings.cl,v 1.4 2002/03/10 11:13:07 kevin Exp $
 ;;;;
 ;;;; This file is part of the UFFI. 
 ;;;;
@@ -31,7 +31,12 @@
 (in-package :uffi)
 
 
-(defmacro convert-from-c-string (obj)
+(def-constant +null-cstring-pointer+
+    #+cmu nil
+    #+allegro 0
+    #+lispworks (fli:make-pointer :address 0 :type :char))
+
+(defmacro convert-from-cstring (obj)
   "Converts a string from a c-call. Same as convert-from-foreign-string, except
 that CMU automatically converts strings from c-calls."
   #+cmu obj
@@ -49,10 +54,10 @@ that CMU automatically converts strings from c-calls."
         (values (excl:native-to-string ,stored)))))
   )
 
-(defmacro convert-to-c-string (obj)
+(defmacro convert-to-cstring (obj)
   #+lispworks
   `(if (null ,obj)
-       +null-c-string-pointer+
+       +null-cstring-pointer+
      (fli:make-pointer
       :address (fli:pointer-address (fli:convert-to-foreign-string ,obj))
       :type :char))
@@ -64,7 +69,7 @@ that CMU automatically converts strings from c-calls."
   (declare (ignore obj))
   )
 
-(defmacro free-c-string (obj)
+(defmacro free-cstring (obj)
   #+lispworks
   `(unless (fli:null-pointer-p ,obj)
      (fli:free-foreign-object ,obj))
@@ -95,7 +100,7 @@ that CMU automatically converts strings from c-calls."
       :null-terminated-p ,null-terminated-p
       :external-format '(:latin-1 :eol-style :lf)))      
   #+cmu
-  `(cmucl-naturalize-c-string (alien:alien-sap ,obj)
+  `(cmucl-naturalize-cstring (alien:alien-sap ,obj)
                              :length ,length
                              :null-terminated-p ,null-terminated-p)
   )
@@ -103,7 +108,7 @@ that CMU automatically converts strings from c-calls."
 (defmacro convert-to-foreign-string (obj)
   #+lispworks
   `(if (null ,obj)
-       +null-c-string-pointer+
+       +null-cstring-pointer+
      (fli:make-pointer
       :address (fli:pointer-address (fli:convert-to-foreign-string ,obj))
       :type :char))
@@ -148,7 +153,7 @@ that CMU automatically converts strings from c-calls."
   `(ff:allocate-fobject :char :c ,size)
   )
 
-(defmacro with-c-string ((foreign-string lisp-string) &body body)
+(defmacro with-cstring ((foreign-string lisp-string) &body body)
   #+cmu
   `(let ((,foreign-string ,lisp-string)) ,@body) 
   #+allegro
@@ -158,7 +163,7 @@ that CMU automatically converts strings from c-calls."
         ,@body)))
   #+lispworks
   (let ((result (gensym)))
-    `(let* ((,foreign-string (convert-to-c-string ,lisp-string))
+    `(let* ((,foreign-string (convert-to-cstring ,lisp-string))
            (,result ,@body))
        (fli:free-foreign-object ,foreign-string)
        ,result))
@@ -166,7 +171,7 @@ that CMU automatically converts strings from c-calls."
 
 ;; Modified from CMUCL's source to handle non-null terminated strings
 #+cmu
-(defun cmucl-naturalize-c-string (sap &key 
+(defun cmucl-naturalize-cstring (sap &key 
                                           length
                                           (null-terminated-p t))
   (declare (type system:system-area-pointer sap))

diff --git a/test-examples.cl b/test-examples.cl
new file mode 100644 (file)
index 0000000..09a3783
--- /dev/null
+++ b/test-examples.cl
@@ -0,0 +1,22 @@
+(mk:load-system :uffi)
+
+(pushnew :test-uffi cl:*features*)
+
+(flet ((load-test (name)
+        (load (merge-pathnames
+               (make-pathname :name name 
+                              :type "cl"
+                              :directory '(:relative "examples"))
+               *load-truename*))))
+       
+  (load-test "strtol")
+  (load-test "gettime")
+  (load-test "getenv")
+  (load-test "gethostname")
+  (load-test "getshells")
+  (load-test "compress"))
+
+(setq cl:*features* (remove :test-uffi cl:*features*))
+
+
+      

diff --git a/tests/compress.cl b/tests/compress.cl
index 640ce26ab2f63aa18f2302cb8ef86bff8b454543..4cb184f6299239d0240ac1b743329a9710f05960 100644 (file)
--- a/tests/compress.cl
+++ b/tests/compress.cl
@@ -9,7 +9,7 @@
 ;;;;
 ;;;; Copyright (c) 2002 Kevin M. Rosenberg
 ;;;;
-;;;; $Id: compress.cl,v 1.4 2002/03/10 05:09:00 kevin Exp $
+;;;; $Id: compress.cl,v 1.5 2002/03/10 11:13:07 kevin Exp $
 ;;;;
 ;;;; This file is part of UFFI. 
 ;;;;
@@ -35,7 +35,7 @@
 (uffi:def-function ("compress" c-compress)
     ((dest (* :unsigned-char))
      (destlen (* :long))
-     (source :c-string)
+     (source :cstring)
      (source-len :long))
   :returning :int
   :module "zlib")
@@ -48,7 +48,7 @@
         (dest (uffi:allocate-foreign-string destsize :unsigned t))
         (destlen (uffi:allocate-foreign-object :long)))
     (setf (uffi:deref-pointer destlen :long) destsize)
-    (uffi:with-c-string (source-native source)
+    (uffi:with-cstring (source-native source)
       (let ((result (c-compress dest destlen source-native sourcelen))
            (newdestlen (uffi:deref-pointer destlen :long)))
        (unwind-protect

diff --git a/tests/getenv.cl b/tests/getenv.cl
index 2f83426f11885b49601999ad5ba3904a3d41ace9..c6da2a0c9bff1cefaaa8014f708f7e920feae498 100644 (file)
--- a/tests/getenv.cl
+++ b/tests/getenv.cl
@@ -9,7 +9,7 @@
 ;;;;
 ;;;; Copyright (c) 2002 Kevin M. Rosenberg
 ;;;;
-;;;; $Id: getenv.cl,v 1.4 2002/03/10 05:13:09 kevin Exp $
+;;;; $Id: getenv.cl,v 1.5 2002/03/10 11:13:07 kevin Exp $
 ;;;;
 ;;;; This file is part of UFFI. 
 ;;;;
@@ -31,15 +31,15 @@
 
 
 (uffi:def-function ("getenv" c-getenv) 
-    ((name :c-string))
-  :returning :c-string)
+    ((name :cstring))
+  :returning :cstring)
 
 (defun my-getenv (key)
   "Returns an environment variable, or NIL if it does not exist"
   (check-type key string)
-  (uffi:with-c-string (key-native key)
-    (let ((value-c-string (c-getenv key-native)))
-      (uffi:convert-from-c-string value-c-string))))
+  (uffi:with-cstring (key-native key)
+    (let ((value-cstring (c-getenv key-native)))
+      (uffi:convert-from-cstring value-cstring))))
     
 #+test-uffi
 (progn

diff --git a/tests/gethostname.cl b/tests/gethostname.cl
index fbb3539a6230914c3bd717bc992ece1e95c4f292..125b83ab5c4a481d3fb75b3733d9476aa19d4d2b 100644 (file)
--- a/tests/gethostname.cl
+++ b/tests/gethostname.cl
@@ -9,7 +9,7 @@
 ;;;;
 ;;;; Copyright (c) 2002 Kevin M. Rosenberg
 ;;;;
-;;;; $Id: gethostname.cl,v 1.3 2002/03/10 04:15:33 kevin Exp $
+;;;; $Id: gethostname.cl,v 1.4 2002/03/10 11:13:07 kevin Exp $
 ;;;;
 ;;;; This file is part of UFFI. 
 ;;;;
@@ -33,7 +33,7 @@
 ;;; This example is inspired by the example on the CL-Cookbook web site
 
 (uffi:def-function ("gethostname" c-gethostname) 
-    ((name :c-string)
+    ((name :cstring)
      (len :int))
   :returning :int)
 

diff --git a/tests/getshells.cl b/tests/getshells.cl
index 50040ec99b4db81dd1e352f7286256b18cedffea..7bab9cac78b90fdc69e500a3bd34043ecc6e43dd 100644 (file)
--- a/tests/getshells.cl
+++ b/tests/getshells.cl
@@ -9,7 +9,7 @@
 ;;;;
 ;;;; Copyright (c) 2002 Kevin M. Rosenberg
 ;;;;
-;;;; $Id: getshells.cl,v 1.3 2002/03/10 04:15:33 kevin Exp $
+;;;; $Id: getshells.cl,v 1.4 2002/03/10 11:13:07 kevin Exp $
 ;;;;
 ;;;; This file is part of UFFI. 
 ;;;;
@@ -40,14 +40,14 @@
 
 (uffi:def-function "getusershell"
     nil
-  :returning :c-string)
+  :returning :cstring)
 
 (defun getshells ()
   "Returns list of valid shells"
   (setusershell)
   (let (shells)
-    (do ((shell (uffi:convert-from-c-string (getusershell))
-                (uffi:convert-from-c-string (getusershell))))
+    (do ((shell (uffi:convert-from-cstring (getusershell))
+                (uffi:convert-from-cstring (getusershell))))
        ((null shell))
       (push shell shells))
     (endusershell)

diff --git a/tests/strtol.cl b/tests/strtol.cl
index 98131602bc57d65629c8d1e479011af10d08c905..518eb2909fa102b95ef93f48a3e7136199d98bd3 100644 (file)
--- a/tests/strtol.cl
+++ b/tests/strtol.cl
@@ -9,7 +9,7 @@
 ;;;;
 ;;;; Copyright (c) 2002 Kevin M. Rosenberg
 ;;;;
-;;;; $Id: strtol.cl,v 1.5 2002/03/10 05:09:00 kevin Exp $
+;;;; $Id: strtol.cl,v 1.6 2002/03/10 11:13:07 kevin Exp $
 ;;;;
 ;;;; This file is part of UFFI. 
 ;;;;
@@ -31,7 +31,7 @@
 
 (uffi:def-type char-ptr (* :char))
   
-;; This example does not use :c-string to pass the input string since
+;; This example does not use :cstring to pass the input string since
 ;; the routine needs to do pointer arithmetic to see how many characters
 ;; were parsed