X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=examples%2Fgettime.lisp;h=4606fd4054e1af458035b23145420760ea525642;hb=54929de80ac68bb7ef45a28e70945c7243d39c82;hp=7707f647c2c306f042a1a93a8c65ec2c5414e63b;hpb=ebedde4e67b858b1f65c5eb4dc7bc45978ed1e40;p=uffi.git diff --git a/examples/gettime.lisp b/examples/gettime.lisp index 7707f64..4606fd4 100644 --- a/examples/gettime.lisp +++ b/examples/gettime.lisp @@ -9,11 +9,8 @@ ;;;; ;;;; $Id$ ;;;; -;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg +;;;; This file, part of UFFI, is Copyright (c) 2002-2005 by Kevin M. Rosenberg ;;;; -;;;; 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) @@ -31,7 +28,7 @@ (yday :int) (isdst :int)) -(uffi:def-function ("time" c-time) +(uffi:def-function ("time" c-time) ((time (* time-t))) :returning time-t) @@ -49,15 +46,15 @@ (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)))) + (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)))) @@ -70,7 +67,7 @@ (let ((time (gettime))) (util.test:test (stringp time) t :fail-info "Time is not a string") (util.test:test (plusp (parse-integer time :junk-allowed t)) - t - :fail-info "time string does not start with a number"))) + t + :fail-info "time string does not start with a number"))) + -