r1605: *** empty log message ***

[uffi.git] / examples / strtol.cl

diff --git a/examples/strtol.cl b/examples/strtol.cl
index 387d23b26b639b4a8fbf7705d1ecc1a20ccf0b14..eefee46e261175b7654c506ce7fc9004adb6a519 100644 (file)
--- a/examples/strtol.cl
+++ b/examples/strtol.cl
@@ -1,42 +1,31 @@
-;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
+;;;; -*- Mode: 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.11 2002/03/20 04:56:52 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)
@@ -49,21 +38,27 @@ of first non-valid character"
   (let* ((str-native (uffi:convert-to-foreign-string str))
         (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
 (progn
   (flet ((print-results (str)