-;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
+;;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*-
;;;; *************************************************************************
;;;; FILE IDENTIFICATION
;;;;
;;;; 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.11 2002/03/20 04:56:52 kevin Exp $
;;;;
;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
;;;;
(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)
(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)