X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests%2Fstrtol.cl;h=32c5c42e1bfd836a54595db210d5e7b9d7337c6f;hb=bb58879f51d870e04e6f01b3ba2c4906703079e0;hp=8f52638bf0d744e51909b10dd4bc656b9217568e;hpb=bf5c7e7c36474375604bcbcedea8794a68dd1784;p=uffi.git

diff --git a/tests/strtol.cl b/tests/strtol.cl
index 8f52638..32c5c42 100644
--- a/tests/strtol.cl
+++ b/tests/strtol.cl
@@ -1,4 +1,4 @@
-;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
+;;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*-
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: strtol.cl,v 1.8 2002/03/14 21:03:12 kevin Exp $
+;;;; $Id: strtol.cl,v 1.15 2002/04/02 23:27:05 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -18,14 +18,14 @@
 
 (in-package :cl-user)
 
-(uffi:def-foreign-type char-ptr (* :char))
+(uffi:def-foreign-type char-ptr (* :unsigned-char))
   
 ;; 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
 
 (uffi:def-function ("strtol" c-strtol) 
-    ((nptr (* :char))
+    ((nptr char-ptr)
      (endptr (* char-ptr))
      (base :int))
   :returning :long)
@@ -36,24 +36,30 @@ Condition flag is T if all of string parses as a long, NIL if
 their was no string at all, or an integer indicating position in string
 of first non-valid character"
   (let* ((str-native (uffi:convert-to-foreign-string str))
-	 (endptr (uffi:allocate-foreign-object char-ptr))
+	 (endptr (uffi:allocate-foreign-object 'char-ptr))
 	 (value (c-strtol str-native endptr base))
-	 (endptr-value (uffi:deref-pointer endptr 'char-ptr))
-	 (next-char-value (uffi:deref-pointer endptr-value :char))
-	 (chars-parsed (- (uffi:pointer-address endptr-value)
-			  (uffi:pointer-address str-native))))
-    (uffi:free-foreign-object str-native)
-    (uffi:free-foreign-object endptr)
-    (cond
-     ((zerop chars-parsed)
-      (values nil nil))
-     ((uffi:null-char-p next-char-value)
-      (values value t))
-     (t
-      (values value chars-parsed)))))
+	 (endptr-value (uffi:deref-pointer endptr 'char-ptr)))
 
+    (unwind-protect
+	 (if (uffi:null-pointer-p endptr-value)
+	     (values value t)
+	     (let ((next-char-value (uffi:deref-pointer endptr-value :unsigned-char))
+		   (chars-parsed (- (uffi:pointer-address endptr-value)
+				    (uffi:pointer-address str-native))))
+	       (cond
+		 ((zerop chars-parsed)
+		  (values nil nil))
+		 ((uffi:null-char-p next-char-value)
+		  (values value t))
+		 (t
+		  (values value chars-parsed)))))
+      (progn
+	(uffi:free-foreign-object str-native)
+	(uffi:free-foreign-object endptr)))))
 
-#+test-uffi
+ 
+  
+#+examples-uffi
 (progn
   (flet ((print-results (str)
 	   (multiple-value-bind (result flag) (strtol str)
@@ -62,3 +68,16 @@ of first non-valid character"
     (print-results "55.3")
     (print-results "a")))
 
+#+test-uffi
+(progn
+  (flet ((test-strtol (str results)
+	   (util.test:test (multiple-value-list (strtol str)) results
+			   :test #'equal
+			   :fail-info "Error testing strtol")))
+    (test-strtol "123" '(123 t))
+    (test-strtol "0" '(0 t))
+    (test-strtol "55a" '(55 2))
+    (test-strtol "a" '(nil nil))))
+
+			   
+