X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=uffi%2Fclsql-uffi.cl;fp=uffi%2Fclsql-uffi.cl;h=0000000000000000000000000000000000000000;hb=7d50938ba2db52a713498e49aa1679deae6f0b6b;hp=2d1cd942b0dff5549e387fa08276c943bb8ab74c;hpb=998937376fa6f9ce29bd3c7954fb0ebca91c37d7;p=clsql.git

diff --git a/uffi/clsql-uffi.cl b/uffi/clsql-uffi.cl
deleted file mode 100644
index 2d1cd94..0000000
--- a/uffi/clsql-uffi.cl
+++ /dev/null
@@ -1,103 +0,0 @@
-;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
-;;;; *************************************************************************
-;;;; FILE IDENTIFICATION
-;;;;
-;;;; Name:          clsql-uffi.cl
-;;;; Purpose:       Common functions for interfaces using UFFI
-;;;; Programmers:   Kevin M. Rosenberg
-;;;; Date Started:  Mar 2002
-;;;;
-;;;; $Id: clsql-uffi.cl,v 1.1 2002/09/18 07:50:01 kevin Exp $
-;;;;
-;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
-;;;;
-;;;; CLSQL users are granted the rights to distribute and use this software
-;;;; as governed by the terms of the Lisp Lesser GNU Public License
-;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
-;;;; *************************************************************************
-
-(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
-(in-package :clsql-uffi)
-
-
-(defun canonicalize-type-list (types auto-list)
-  "Ensure a field type list meets expectations"
-  (let ((length-types (length types))
-	(new-types '()))
-    (loop for i from 0 below (length auto-list)
-	  do
-	  (if (>= i length-types)
-	      (push t new-types) ;; types is shorted than num-fields
-	      (push
-	       (case (nth i types)
-		 (:int
-		  (case (nth i auto-list)
-		    (:int32
-		     :int32)
-		    (:int64
-		     :int64)
-		    (t
-		     t)))
-		 (:double
-		  (case (nth i auto-list)
-		    (:double
-		     :double)
-		    (t
-		     t)))
-		 (:int32
-		  (if (eq :int32 (nth i auto-list))
-		      :int32
-		    t))
-		 (:int64
-		  (if (eq :int64 (nth i auto-list))
-		      :int64
-		    t))
-		 (t
-		  t))
-	       new-types)))
-    (nreverse new-types)))
-
-(uffi:def-function "atoi"
-    ((str (* :unsigned-char)))
-  :returning :int)
-
-(uffi:def-function "atol"
-    ((str (* :unsigned-char)))
-  :returning :long)
-
-(uffi:def-function "atof"
-    ((str (* :unsigned-char)))
-  :returning :double)
-
-(uffi:def-function "atol64"
-    ((str (* :unsigned-char))
-     (high32 (* :int)))
-  :returning :unsigned-int)
-
-(uffi:def-constant +2^32+ 4294967296)
-(uffi:def-constant +2^32-1+ (1- +2^32+))
-
-(defmacro make-64-bit-integer (high32 low32)
-  `(+ ,low32 (* ,high32 +2^32+)))
-
-(defmacro split-64-bit-integer (int64)
-  `(values (ash ,int64 -32) (logand ,int64 +2^32-1+)))
-
-(defun convert-raw-field (char-ptr types index)
-  (let ((type (if (listp types)
-		  (nth index types)
-		  types)))
-    (case type
-      (:double
-       (atof char-ptr))
-      ((or :int32 :int)
-       (atoi char-ptr))
-      (:int64
-       (uffi:with-foreign-object (high32-ptr :int)
-	 (let ((low32 (atol64 char-ptr high32-ptr))
-	       (high32 (uffi:deref-pointer high32-ptr :int)))
-	   (if (zerop high32)
-	       low32
-	       (make-64-bit-integer high32 low32)))))
-      (t
-       (uffi:convert-from-foreign-string char-ptr)))))