X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests%2Fstrtol.cl;h=63aea44fb8546fa1a627f193fb44f78e62c78f37;hb=cdd366616d5a526546a26adbded8c562dfce743f;hp=387d23b26b639b4a8fbf7705d1ecc1a20ccf0b14;hpb=e7691ffb0055b6a2c27639838b3b594e808f8973;p=uffi.git

diff --git a/tests/strtol.cl b/tests/strtol.cl
index 387d23b..63aea44 100644
--- a/tests/strtol.cl
+++ b/tests/strtol.cl
@@ -1,42 +1,31 @@
-;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
+;;;; -*- Mode: ANSI-Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*-
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Name:          getenv.cl
-;;;; Purpose:       UFFI Example file to strtol
+;;;; Name:          strtol.cl
+;;;; Purpose:       UFFI Example file to strtol, uses pointer arithmetic
 ;;;; Programmer:    Kevin M. Rosenberg
-;;;; Date Started:  Mar 2002
+;;;; Date Started:  Feb 2002
 ;;;;
-;;;; Copyright (c) 2002 Kevin M. Rosenberg
+;;;; $Id: strtol.cl,v 1.9 2002/03/17 17:33:30 kevin Exp $
 ;;;;
-;;;; $Id: strtol.cl,v 1.4 2002/03/10 04:36:04 kevin Exp $
+;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
-;;;; This file is part of UFFI. 
-;;;;
-;;;; UFFI is free software; you can redistribute it and/or modify
-;;;; it under the terms of the GNU General Public License (version 2) as
-;;;; published by the Free Software Foundation.
-;;;;
-;;;; UFFI is distributed in the hope that it will be useful,
-;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;;; GNU General Public License for more details.
-;;;;
-;;;; You should have received a copy of the GNU General Public License
-;;;; along with UFFI; if not, write to the Free Software Foundation, Inc.,
-;;;; 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+;;;; UFFI 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.
 ;;;; *************************************************************************
 
 (in-package :cl-user)
 
-(uffi:def-type char-ptr (* :unsigned-char))
+(uffi:def-foreign-type char-ptr (* :unsigned-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
 
 (uffi:def-function ("strtol" c-strtol) 
-    ((nptr (* :unsigned-char))
+    ((nptr char-ptr)
      (endptr (* char-ptr))
      (base :int))
   :returning :long)
@@ -50,20 +39,27 @@ of first non-valid character"
 	 (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)))))
+	 next-char-value chars-parsed)
 
+    (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
 (progn
   (flet ((print-results (str)