X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=uffi%2Fclsql-uffi.lisp;h=76dfd043c7aac23907eb9f530c745c94518cb4a7;hp=1bb9a1a90d0b6085b4d5f3d6d754fb5b4f5e2e80;hb=eabede9da3e61ef5191b601dcf9b30f30f613f3e;hpb=645d2ea7396466b8673e3421b55e45cd327f0195

diff --git a/uffi/clsql-uffi.lisp b/uffi/clsql-uffi.lisp
index 1bb9a1a..76dfd04 100644
--- a/uffi/clsql-uffi.lisp
+++ b/uffi/clsql-uffi.lisp
@@ -7,9 +7,7 @@
 ;;;; Programmers:   Kevin M. Rosenberg
 ;;;; Date Started:  Mar 2002
 ;;;;
-;;;; $Id$
-;;;;
-;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
+;;;; This file, part of CLSQL, is Copyright (c) 2002-2010 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
@@ -30,39 +28,63 @@
        (nreverse new-types))
     (declare (fixnum length-types length-auto-list i))
     (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))))
+        (push t new-types) ;; types is shorter 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))
+           (:blob
+            :blob)
+           (:uint
+            :uint)
+           (t
+            t))
+         new-types))))
 
 (uffi:def-function "atoi"
     ((str (* :unsigned-char)))
   :returning :int)
 
+(uffi:def-function ("strtoul" c-strtoul)
+    ((str (* :unsigned-char))
+     (endptr (* :unsigned-char))
+     (radix :int))
+  :returning :unsigned-long)
+
+#-windows
+(uffi:def-function ("strtoull" c-strtoull)
+    ((str (* :unsigned-char))
+     (endptr (* :unsigned-char))
+     (radix :int))
+  :returning :unsigned-long-long)
+
+#+windows
+(uffi:def-function ("_strtoui64" c-strtoull)
+    ((str (* :unsigned-char))
+     (endptr (* :unsigned-char))
+     (radix :int))
+  :returning :unsigned-long-long)
+
 (uffi:def-function "atol"
     ((str (* :unsigned-char)))
   :returning :long)
@@ -73,7 +95,8 @@
 
 (uffi:def-function "atol64"
     ((str (* :unsigned-char))
-     (high32 (* :int)))
+     (high32 (* :unsigned-int)))
+  :module "clsql-uffi"
   :returning :unsigned-int)
 
 (uffi:def-constant +2^32+ 4294967296)
@@ -94,32 +117,60 @@
 
 (uffi:def-type char-ptr-def (* :unsigned-char))
 
-(defun convert-raw-field (char-ptr types index &optional length)
+(defun strtoul (char-ptr)
   (declare (optimize (speed 3) (safety 0) (space 0))
- 	   (type char-ptr-def char-ptr))
-  (let ((type (if (listp types)
-		  (nth index types)
-		  types)))
-    (cond
-      ((uffi:null-pointer-p char-ptr)
-       nil)
-      (t
-       (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
-          (if length
-	      (uffi:convert-from-foreign-string char-ptr :locale :none
-                                                :null-terminated-p nil
-                                                :length length)
-            (uffi:convert-from-foreign-string char-ptr :locale :none))))))))
+           (type char-ptr-def char-ptr))
+  (c-strtoul char-ptr uffi:+null-cstring-pointer+ 10))
 
+(defun strtoull (char-ptr)
+  (declare (optimize (speed 3) (safety 0) (space 0))
+           (type char-ptr-def char-ptr))
+  (c-strtoull char-ptr uffi:+null-cstring-pointer+ 10))
+
+(defun convert-raw-field (char-ptr type &key length encoding)
+ (declare (optimize (speed 3) (safety 0) (space 0))
+          (type char-ptr-def char-ptr))
+ (cond
+   ((uffi:null-pointer-p char-ptr)
+    nil)
+   (t
+    (case type
+      (:double
+       (atof char-ptr))
+      (:int
+       (atol char-ptr))
+      (:int32
+       (atoi char-ptr))
+      (:uint32
+       (strtoul char-ptr))
+      (:uint
+       (strtoul char-ptr))
+      ((:int64 :uint64)
+       (strtoull char-ptr)
+       #|(uffi:with-foreign-object (high32-ptr :unsigned-int)
+         (let ((low32 (atol64 char-ptr high32-ptr))
+               (high32 (uffi:deref-pointer high32-ptr :unsigned-int)))
+           (if (zerop high32)
+               low32
+               (make-64-bit-integer high32 low32))))|#
+)
+      (:blob
+       (if length
+           (uffi:convert-from-foreign-usb8 char-ptr length)
+           (error "Can't return blob since length is not specified.")))
+      (t
+       (if encoding
+           (if length
+               (uffi:convert-from-foreign-string char-ptr
+                                                 :null-terminated-p nil
+                                                 :length length
+                                                 :encoding encoding)
+               (uffi:convert-from-foreign-string char-ptr
+                                                 :null-terminated-p t
+                                                 :encoding encoding))
+           (if length
+               (uffi:convert-from-foreign-string char-ptr
+                                                 :null-terminated-p nil
+                                                 :length length)
+               (uffi:convert-from-foreign-string char-ptr
+                                                 :null-terminated-p t))))))))