X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests%2Fcompress.cl;h=c45029de8637213045c76c69fd21418812c03aed;hb=fb93b1923db347f01bdebc7226e5e1eaacacc9f9;hp=1ef513db8adde6bf4ae8d5ff595159db9a56fe52;hpb=baabff1a8dbf4813072d87f6977cd488c376fe56;p=uffi.git diff --git a/tests/compress.cl b/tests/compress.cl index 1ef513d..c45029d 100644 --- a/tests/compress.cl +++ b/tests/compress.cl @@ -1,41 +1,32 @@ -;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*- +;;;; -*- Mode: ANSI-Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*- ;;;; ************************************************************************* ;;;; FILE IDENTIFICATION ;;;; ;;;; Name: compress.cl ;;;; Purpose: UFFI Example file for zlib compression ;;;; Programmer: Kevin M. Rosenberg -;;;; Date Started: Mar 2002 +;;;; Date Started: Feb 2002 ;;;; -;;;; Copyright (c) 2002 Kevin M. Rosenberg +;;;; $Id: compress.cl,v 1.8 2002/03/17 17:33:30 kevin Exp $ ;;;; -;;;; $Id: compress.cl,v 1.3 2002/03/10 04:15: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) -(unless (uffi:load-foreign-library "/usr/lib/libz.so" "zlib" '("c")) +(unless (uffi:load-foreign-library "/usr/lib/libz.so" + :module "zlib" + :supporting-libraries '("c")) (warn "Unable to load zlib")) (uffi:def-function ("compress" c-compress) ((dest (* :unsigned-char)) (destlen (* :long)) - (source :c-string) + (source :cstring) (source-len :long)) :returning :int :module "zlib") @@ -45,10 +36,10 @@ and the numbe of compressed bytes" (let* ((sourcelen (length source)) (destsize (+ 12 (ceiling (* sourcelen 1.01)))) - (dest (uffi:allocate-foreign-string destsize)) + (dest (uffi:allocate-foreign-string destsize :unsigned t)) (destlen (uffi:allocate-foreign-object :long))) (setf (uffi:deref-pointer destlen :long) destsize) - (uffi:with-c-string (source-native source) + (uffi:with-cstring (source-native source) (let ((result (c-compress dest destlen source-native sourcelen)) (newdestlen (uffi:deref-pointer destlen :long))) (unwind-protect