X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests%2Fgettime.cl;h=69b2f07969dae55d025884f8fd1ae1f0b6af49bf;hb=9da32ae8be205781e0e54f8cba574a9a2c432883;hp=a26e57ecc6c6fc1bd607f1ef8bba6d4637393be0;hpb=192193db6e4fbda90a840474d4aa2e8762597927;p=uffi.git

diff --git a/tests/gettime.cl b/tests/gettime.cl
index a26e57e..69b2f07 100644
--- a/tests/gettime.cl
+++ b/tests/gettime.cl
@@ -2,34 +2,23 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Name:          getenv.cl
-;;;; Purpose:       UFFI Example file to get time
+;;;; Name:          gettime
+;;;; Purpose:       UFFI Example file to get time, use C structures
 ;;;; Programmer:    Kevin M. Rosenberg
-;;;; Date Started:  Mar 2002
+;;;; Date Started:  Feb 2002
 ;;;;
-;;;; Copyright (c) 2002 Kevin M. Rosenberg
+;;;; $Id: gettime.cl,v 1.7 2002/03/23 16:32:39 kevin Exp $
 ;;;;
-;;;; $Id: gettime.cl,v 1.1 2002/03/09 19:55:33 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 time-t :unsigned-long)
+(uffi:def-foreign-type time-t :unsigned-long)
 
 (uffi:def-struct tm
     (sec :int)
@@ -42,31 +31,38 @@
   (yday :int)
   (isdst :int))
 
-(uffi:def-routine ("time" c-time) 
+(uffi:def-function ("time" c-time) 
     ((time (* time-t)))
   :returning time-t)
 
-(uffi:def-routine ("localtime" c-localtime)
+(uffi:def-function ("localtime" c-localtime)
     ((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"
+   (uffi:with-foreign-object (time '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)
+				  )))
+	 time-string))))
+
+
+
+
+#+test-uffi
 (format t "~&~A" (gettime))