r5021: Automatic commit for debian_version_1_6_4-1

[clsql.git] / uffi / clsql-uffi.lisp

diff --git a/uffi/clsql-uffi.lisp b/uffi/clsql-uffi.lisp
index 7bc3a94c55678c8d2a7af65f579f493c429bd1f9..547738c51ce9dd17137ab39e5cd8be45aa08291b 100644 (file)
--- a/uffi/clsql-uffi.lisp
+++ b/uffi/clsql-uffi.lisp
@@ -1,4 +1,4 @@
-;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
+l;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
@@ -7,7 +7,7 @@
 ;;;; Programmers:   Kevin M. Rosenberg
 ;;;; Date Started:  Mar 2002
 ;;;;
-;;;; $Id: clsql-uffi.lisp,v 1.23 2003/05/17 07:50:55 kevin Exp $
+;;;; $Id: clsql-uffi.lisp,v 1.25 2003/05/22 15:44:30 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -120,33 +120,14 @@
                  low32
                  (make-64-bit-integer high32 low32)))))
         (t
-         ;; Choose optimized routine
-         #-(or cmu sbcl lispworks scl)
-         (native-to-string char-ptr)
-         #+(or cmu sbcl lispworks scl)
-         (uffi:convert-from-foreign-string char-ptr)))))))
+         #+allegro (native-to-string char-ptr) ;; optimized
+         #-allegro (uffi:convert-from-foreign-string char-ptr)))))))
   
 
 (uffi:def-function "strlen"
     ((str (* :unsigned-char)))
   :returning :unsigned-int)
 
-#-allegro
-(defun native-to-string (s)
-  (declare (optimize (speed 3) (space 0) (safety 0) (compilation-speed 0))
-          (type char-ptr-def s))
-  (let* ((len (strlen s))
-        (str (make-string len)))
-    (declare (fixnum len)
-            (simple-string str))
-    (do ((i 0))
-       ((= i len))
-      (declare (fixnum i))
-      (setf (schar str i)
-       (code-char (uffi:deref-array s '(:array :unsigned-char) i)))
-      (incf i))
-    str))
-
 #+(and allegro ics)
 (defun native-to-string (s)
   (declare (optimize (speed 3) (space 0) (safety 0) (compilation-speed 0))
@@ -163,7 +144,7 @@
       (incf i))
     str))
 
-#-(and allegro ics)
+#+(and allegro (not ics))
 (defun native-to-string (s)
   (declare (optimize (speed 3) (space 0) (safety 0) (compilation-speed 0))
           (type char-ptr-def s))
@@ -185,6 +166,3 @@
        (uffi:deref-array s '(:array :unsigned-char) i))
       (incf i))
     str))
-
-
-