X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;ds=sidebyside;f=tests%2Fgettime.cl;h=1c644217ed56c226882e81d96026eb157c7dd31e;hb=63b0648b562bc5a8db5ef013804b1ff4e5c52314;hp=ea71edcd1badab116e7f38a4f12668b287ea4505;hpb=bc5968d54cee0416db7db9ee2c7295489170bccf;p=uffi.git

diff --git a/tests/gettime.cl b/tests/gettime.cl
index ea71edc..1c64421 100644
--- a/tests/gettime.cl
+++ b/tests/gettime.cl
@@ -9,7 +9,7 @@
 ;;;;
 ;;;; Copyright (c) 2002 Kevin M. Rosenberg
 ;;;;
-;;;; $Id: gettime.cl,v 1.2 2002/03/09 21:19:31 kevin Exp $
+;;;; $Id: gettime.cl,v 1.5 2002/03/11 18:00:57 kevin Exp $
 ;;;;
 ;;;; This file is part of UFFI. 
 ;;;;
@@ -29,7 +29,7 @@
 
 (in-package :cl-user)
 
-(uffi:def-type time-t :unsigned-long)
+(uffi:def-foreign-type time-t :unsigned-long)
 
 (uffi:def-struct tm
     (sec :int)
@@ -50,23 +50,32 @@
     ((time (* time-t)))
   :returning (* tm))
 
+(uffi:def-type time-t :unsigned-long)
+(uffi:def-type tm-pointer (* tm))
+
 (defun gettime ()
-  "Returns the local time"
-  (let* ((time (uffi:allocate-foreign-object time-t)))
-    (c-time time)
-    (let* ((tm-ptr (c-localtime time))
-	   (time-string (format nil "~2d/~2,'0d/~d ~2d:~2,'0d:~2,'0d" 
-				(1+ (uffi:get-slot-value tm-ptr 'mon 'tm))
-				(uffi:get-slot-value tm-ptr 'mday 'tm)
-				(+ 1900 (uffi:get-slot-value tm-ptr 'year 'tm))
-				(uffi:get-slot-value tm-ptr 'hour 'tm)
-				(uffi:get-slot-value tm-ptr 'min 'tm)
-				(uffi:get-slot-value tm-ptr 'sec 'tm)
-				)))
-      (uffi:free-foreign-object time)
-      time-string)
-    ))
-    
+   "Returns the local time"
+   (let* ((time (uffi:allocate-foreign-object time-t)))
+     (declare (type time-t time))
+     (c-time time)
+     (let ((tm-ptr (the tm-pointer (c-localtime time))))
+       (declare (type tm-pointer tm-ptr))
+       (let ((time-string (format nil "~2d/~2,'0d/~d ~2d:~2,'0d:~2,'0d" 
+				  (1+ (uffi:get-slot-value tm-ptr 'tm 'mon))
+				  (uffi:get-slot-value tm-ptr 'tm 'mday)
+				  (+ 1900 (uffi:get-slot-value tm-ptr 'tm 'year))
+				  (uffi:get-slot-value tm-ptr 'tm 'hour)
+				  (uffi:get-slot-value tm-ptr 'tm 'min)
+				  (uffi:get-slot-value tm-ptr 'tm 'sec)
+				  )))
+	 (uffi:free-foreign-object time)
+	 time-string))
+     ))
+
+
+
+
+#+test-uffi
 (format t "~&~A" (gettime))