X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=examples%2Fcompress.cl;h=1abaff6a4542dd831d4a05d02d0a14221a1e5c49;hb=9d071d3a1c2b8bbd91261908a424ea74472a3bb5;hp=cf3bec4e90f6fa66f323bf249a203eebd8a90d8b;hpb=192193db6e4fbda90a840474d4aa2e8762597927;p=uffi.git

diff --git a/examples/compress.cl b/examples/compress.cl
index cf3bec4..1abaff6 100644
--- a/examples/compress.cl
+++ b/examples/compress.cl
@@ -1,41 +1,36 @@
-;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
+;;;; -*- Mode: 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.13 2002/09/20 06:03:36 kevin Exp $
 ;;;;
-;;;; $Id: compress.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)
 
-(unless (uffi:load-foreign-library "/usr/lib/libz.so" "zlib" '("c"))
+(unless (uffi:load-foreign-library
+	 (uffi:find-foreign-library
+	  "libz"
+	  '("/usr/local/lib/" "/usr/lib/" "/zlib/")
+	  :types '("so" "a" "dylib"))
+	 :module "zlib" 
+	 :supporting-libraries '("c"))
   (warn "Unable to load zlib"))
 
-(uffi:def-routine ("compress" c-compress)
+(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 +40,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
@@ -64,3 +59,19 @@
 	    (uffi:free-foreign-object dest)))))))
 
 
+#+examples-uffi
+(progn
+  (flet ((print-results (str)
+	   (multiple-value-bind (compressed len) (compress str)
+	       (format t "~&(compress ~S) => " str)
+	       (dotimes (i len)
+		 (format t "~X" (char-code (char compressed i))))
+	       (format t ",~D" len))))
+    (print-results "")
+    (print-results "test")
+    (print-results "test2")))
+
+;; Results of the above on my system:
+;; (compress "") => 789c300001,8
+;; (compress "test") => 789c2b492d2e1045d1c1,12
+;; (compress "test2") => 789c2b492d2e31206501f3,13