From 35ddd15fad42a60b445284900020d5b5a7edad8c Mon Sep 17 00:00:00 2001
From: "Kevin M. Rosenberg" <kevin@rosenberg.net>
Date: Mon, 10 Mar 2003 17:37:05 +0000
Subject: [PATCH] r4176: *** empty log message ***

---
 debian/changelog       |   6 ++
 examples/compress.lisp | 239 ++++++++++++++++++++---------------------
 tests/compress.lisp    | 239 ++++++++++++++++++++---------------------
 3 files changed, 244 insertions(+), 240 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 77cf13b..7924e70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-uffi (1.2.8-1) unstable; urgency=low
+
+  * Change output on compress.lisp example
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Mon, 10 Mar 2003 10:37:00 -0700
+
 cl-uffi (1.2.7-1) unstable; urgency=low
 
   * Remove reference to obsolete Corman module in uffi.asd
diff --git a/examples/compress.lisp b/examples/compress.lisp
index 1229be5..02c8cd2 100644
--- a/examples/compress.lisp
+++ b/examples/compress.lisp
@@ -1,120 +1,119 @@
-;;;; -*- 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:  Feb 2002
-;;;;
-;;;; $Id: compress.lisp,v 1.3 2002/12/09 16:30:20 kevin Exp $
-;;;;
-;;;; This file, part of UFFI, is Copyright (c) 2002 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)
-
-(eval-when (:load-toplevel :execute)
-  (unless (uffi:load-foreign-library
-	   #-(or macosx darwin)
-	   (uffi:find-foreign-library
-	    "libz"
-	    '("/usr/local/lib/" "/usr/lib/" "/zlib/")
-	    :types '("so" "a"))
-	   #+(or macosx darwin)
-	   (uffi:find-foreign-library "z"
-				      `(,(pathname-directory *load-pathname*)))
-	   :module "zlib" 
-	   :supporting-libraries '("c"))
-    (warn "Unable to load zlib")))
-  
-(uffi:def-function ("compress" c-compress)
-    ((dest (* :unsigned-char))
-     (destlen (* :long))
-     (source :cstring)
-     (source-len :long))
-  :returning :int
-  :module "zlib")
-  
-(defun compress (source)
-  "Returns two values: array of bytes containing the compressed data
- and the numbe of compressed bytes"
-  (let* ((sourcelen (length source))
-	 (destsize (+ 12 (ceiling (* sourcelen 1.01))))
-	 (dest (uffi:allocate-foreign-string destsize :unsigned t))
-	 (destlen (uffi:allocate-foreign-object :long)))
-    (setf (uffi:deref-pointer destlen :long) destsize)
-    (uffi:with-cstring (source-native source)
-      (let ((result (c-compress dest destlen source-native sourcelen))
-	    (newdestlen (uffi:deref-pointer destlen :long)))
-	(unwind-protect
-	    (if (zerop result)
-		(values (uffi:convert-from-foreign-string 
-			 dest
-			 :length newdestlen
-			 :null-terminated-p nil)
-			newdestlen)
-	      (error "zlib error, code ~D" result))
-	  (progn
-	    (uffi:free-foreign-object destlen)
-	    (uffi:free-foreign-object dest)))))))
-
-(uffi:def-function ("uncompress" c-uncompress)
-    ((dest (* :unsigned-char))
-     (destlen (* :long))
-     (source :cstring)
-     (source-len :long))
-  :returning :int
-  :module "zlib")
-
-(defun uncompress (source)
-  (let* ((sourcelen (length source))
-	 (destsize 200000)  ;adjust as needed
-	 (dest (uffi:allocate-foreign-string destsize :unsigned t))
-	 (destlen (uffi:allocate-foreign-object :long)))
-    (setf (uffi:deref-pointer destlen :long) destsize)
-    (uffi:with-cstring (source-native source)
-      (let ((result (c-uncompress dest destlen source-native sourcelen))
-	    (newdestlen (uffi:deref-pointer destlen :long)))
-	(unwind-protect
-	     (if (zerop result)
-		 (uffi:convert-from-foreign-string 
-		  dest
-		  :length newdestlen
-		  :null-terminated-p nil)
-		 (error "zlib error, code ~D" result))
-	  (progn
-	    (uffi:free-foreign-object destlen)
-	    (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")))
-
-#+test-uffi
-(progn
-  (flet ((test-compress (str)
-	   (multiple-value-bind (compressed len) (compress str)
-	     (multiple-value-bind (uncompressed len2) (uncompress compressed)
-	       (util.test:test str uncompressed :test #'string=
-			       :fail-info "Error uncompressing a compressed string")))))
-    (test-compress "")
-    (test-compress "test")
-    (test-compress "test2")))
-
-;; Results of the above on my system:
-;; (compress "") => 789c300001,8
-;; (compress "test") => 789c2b492d2e1045d1c1,12
-;; (compress "test2") => 789c2b492d2e31206501f3,13
+;;;; -*- 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:  Feb 2002
+;;;;
+;;;; $Id: compress.lisp,v 1.4 2003/03/10 17:37:05 kevin Exp $
+;;;;
+;;;; This file, part of UFFI, is Copyright (c) 2002 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)
+
+(eval-when (:load-toplevel :execute)
+  (unless (uffi:load-foreign-library
+	   #-(or macosx darwin)
+	   (uffi:find-foreign-library
+	    "libz"
+	    '("/usr/local/lib/" "/usr/lib/" "/zlib/")
+	    :types '("so" "a"))
+	   #+(or macosx darwin)
+	   (uffi:find-foreign-library "z"
+				      `(,(pathname-directory *load-pathname*)))
+	   :module "zlib" 
+	   :supporting-libraries '("c"))
+    (warn "Unable to load zlib")))
+  
+(uffi:def-function ("compress" c-compress)
+    ((dest (* :unsigned-char))
+     (destlen (* :long))
+     (source :cstring)
+     (source-len :long))
+  :returning :int
+  :module "zlib")
+  
+(defun compress (source)
+  "Returns two values: array of bytes containing the compressed data
+ and the numbe of compressed bytes"
+  (let* ((sourcelen (length source))
+	 (destsize (+ 12 (ceiling (* sourcelen 1.01))))
+	 (dest (uffi:allocate-foreign-string destsize :unsigned t))
+	 (destlen (uffi:allocate-foreign-object :long)))
+    (setf (uffi:deref-pointer destlen :long) destsize)
+    (uffi:with-cstring (source-native source)
+      (let ((result (c-compress dest destlen source-native sourcelen))
+	    (newdestlen (uffi:deref-pointer destlen :long)))
+	(unwind-protect
+	    (if (zerop result)
+		(values (uffi:convert-from-foreign-string 
+			 dest
+			 :length newdestlen
+			 :null-terminated-p nil)
+			newdestlen)
+	      (error "zlib error, code ~D" result))
+	  (progn
+	    (uffi:free-foreign-object destlen)
+	    (uffi:free-foreign-object dest)))))))
+
+(uffi:def-function ("uncompress" c-uncompress)
+    ((dest (* :unsigned-char))
+     (destlen (* :long))
+     (source :cstring)
+     (source-len :long))
+  :returning :int
+  :module "zlib")
+
+(defun uncompress (source)
+  (let* ((sourcelen (length source))
+	 (destsize 200000)  ;adjust as needed
+	 (dest (uffi:allocate-foreign-string destsize :unsigned t))
+	 (destlen (uffi:allocate-foreign-object :long)))
+    (setf (uffi:deref-pointer destlen :long) destsize)
+    (uffi:with-cstring (source-native source)
+      (let ((result (c-uncompress dest destlen source-native sourcelen))
+	    (newdestlen (uffi:deref-pointer destlen :long)))
+	(unwind-protect
+	     (if (zerop result)
+		 (uffi:convert-from-foreign-string 
+		  dest
+		  :length newdestlen
+		  :null-terminated-p nil)
+		 (error "zlib error, code ~D" result))
+	  (progn
+	    (uffi:free-foreign-object destlen)
+	    (uffi:free-foreign-object dest)))))))
+
+#+examples-uffi
+(progn
+  (flet ((print-results (str)
+	   (multiple-value-bind (compressed len) (compress str)
+	     (let ((*print-length* nil))
+	       (format t "~&(compress ~S) => " str)
+	       (format t "~S~%" (map 'list #'char-code compressed))))))
+    (print-results "")
+    (print-results "test")
+    (print-results "test2")))
+
+#+test-uffi
+(progn
+  (flet ((test-compress (str)
+	   (multiple-value-bind (compressed len) (compress str)
+	     (multiple-value-bind (uncompressed len2) (uncompress compressed)
+	       (util.test:test str uncompressed :test #'string=
+			       :fail-info "Error uncompressing a compressed string")))))
+    (test-compress "")
+    (test-compress "test")
+    (test-compress "test2")))
+
+;; Results of the above on my system:
+;; (compress "") => 789c300001,8
+;; (compress "test") => 789c2b492d2e1045d1c1,12
+;; (compress "test2") => 789c2b492d2e31206501f3,13
diff --git a/tests/compress.lisp b/tests/compress.lisp
index 1229be5..02c8cd2 100644
--- a/tests/compress.lisp
+++ b/tests/compress.lisp
@@ -1,120 +1,119 @@
-;;;; -*- 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:  Feb 2002
-;;;;
-;;;; $Id: compress.lisp,v 1.3 2002/12/09 16:30:20 kevin Exp $
-;;;;
-;;;; This file, part of UFFI, is Copyright (c) 2002 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)
-
-(eval-when (:load-toplevel :execute)
-  (unless (uffi:load-foreign-library
-	   #-(or macosx darwin)
-	   (uffi:find-foreign-library
-	    "libz"
-	    '("/usr/local/lib/" "/usr/lib/" "/zlib/")
-	    :types '("so" "a"))
-	   #+(or macosx darwin)
-	   (uffi:find-foreign-library "z"
-				      `(,(pathname-directory *load-pathname*)))
-	   :module "zlib" 
-	   :supporting-libraries '("c"))
-    (warn "Unable to load zlib")))
-  
-(uffi:def-function ("compress" c-compress)
-    ((dest (* :unsigned-char))
-     (destlen (* :long))
-     (source :cstring)
-     (source-len :long))
-  :returning :int
-  :module "zlib")
-  
-(defun compress (source)
-  "Returns two values: array of bytes containing the compressed data
- and the numbe of compressed bytes"
-  (let* ((sourcelen (length source))
-	 (destsize (+ 12 (ceiling (* sourcelen 1.01))))
-	 (dest (uffi:allocate-foreign-string destsize :unsigned t))
-	 (destlen (uffi:allocate-foreign-object :long)))
-    (setf (uffi:deref-pointer destlen :long) destsize)
-    (uffi:with-cstring (source-native source)
-      (let ((result (c-compress dest destlen source-native sourcelen))
-	    (newdestlen (uffi:deref-pointer destlen :long)))
-	(unwind-protect
-	    (if (zerop result)
-		(values (uffi:convert-from-foreign-string 
-			 dest
-			 :length newdestlen
-			 :null-terminated-p nil)
-			newdestlen)
-	      (error "zlib error, code ~D" result))
-	  (progn
-	    (uffi:free-foreign-object destlen)
-	    (uffi:free-foreign-object dest)))))))
-
-(uffi:def-function ("uncompress" c-uncompress)
-    ((dest (* :unsigned-char))
-     (destlen (* :long))
-     (source :cstring)
-     (source-len :long))
-  :returning :int
-  :module "zlib")
-
-(defun uncompress (source)
-  (let* ((sourcelen (length source))
-	 (destsize 200000)  ;adjust as needed
-	 (dest (uffi:allocate-foreign-string destsize :unsigned t))
-	 (destlen (uffi:allocate-foreign-object :long)))
-    (setf (uffi:deref-pointer destlen :long) destsize)
-    (uffi:with-cstring (source-native source)
-      (let ((result (c-uncompress dest destlen source-native sourcelen))
-	    (newdestlen (uffi:deref-pointer destlen :long)))
-	(unwind-protect
-	     (if (zerop result)
-		 (uffi:convert-from-foreign-string 
-		  dest
-		  :length newdestlen
-		  :null-terminated-p nil)
-		 (error "zlib error, code ~D" result))
-	  (progn
-	    (uffi:free-foreign-object destlen)
-	    (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")))
-
-#+test-uffi
-(progn
-  (flet ((test-compress (str)
-	   (multiple-value-bind (compressed len) (compress str)
-	     (multiple-value-bind (uncompressed len2) (uncompress compressed)
-	       (util.test:test str uncompressed :test #'string=
-			       :fail-info "Error uncompressing a compressed string")))))
-    (test-compress "")
-    (test-compress "test")
-    (test-compress "test2")))
-
-;; Results of the above on my system:
-;; (compress "") => 789c300001,8
-;; (compress "test") => 789c2b492d2e1045d1c1,12
-;; (compress "test2") => 789c2b492d2e31206501f3,13
+;;;; -*- 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:  Feb 2002
+;;;;
+;;;; $Id: compress.lisp,v 1.4 2003/03/10 17:37:05 kevin Exp $
+;;;;
+;;;; This file, part of UFFI, is Copyright (c) 2002 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)
+
+(eval-when (:load-toplevel :execute)
+  (unless (uffi:load-foreign-library
+	   #-(or macosx darwin)
+	   (uffi:find-foreign-library
+	    "libz"
+	    '("/usr/local/lib/" "/usr/lib/" "/zlib/")
+	    :types '("so" "a"))
+	   #+(or macosx darwin)
+	   (uffi:find-foreign-library "z"
+				      `(,(pathname-directory *load-pathname*)))
+	   :module "zlib" 
+	   :supporting-libraries '("c"))
+    (warn "Unable to load zlib")))
+  
+(uffi:def-function ("compress" c-compress)
+    ((dest (* :unsigned-char))
+     (destlen (* :long))
+     (source :cstring)
+     (source-len :long))
+  :returning :int
+  :module "zlib")
+  
+(defun compress (source)
+  "Returns two values: array of bytes containing the compressed data
+ and the numbe of compressed bytes"
+  (let* ((sourcelen (length source))
+	 (destsize (+ 12 (ceiling (* sourcelen 1.01))))
+	 (dest (uffi:allocate-foreign-string destsize :unsigned t))
+	 (destlen (uffi:allocate-foreign-object :long)))
+    (setf (uffi:deref-pointer destlen :long) destsize)
+    (uffi:with-cstring (source-native source)
+      (let ((result (c-compress dest destlen source-native sourcelen))
+	    (newdestlen (uffi:deref-pointer destlen :long)))
+	(unwind-protect
+	    (if (zerop result)
+		(values (uffi:convert-from-foreign-string 
+			 dest
+			 :length newdestlen
+			 :null-terminated-p nil)
+			newdestlen)
+	      (error "zlib error, code ~D" result))
+	  (progn
+	    (uffi:free-foreign-object destlen)
+	    (uffi:free-foreign-object dest)))))))
+
+(uffi:def-function ("uncompress" c-uncompress)
+    ((dest (* :unsigned-char))
+     (destlen (* :long))
+     (source :cstring)
+     (source-len :long))
+  :returning :int
+  :module "zlib")
+
+(defun uncompress (source)
+  (let* ((sourcelen (length source))
+	 (destsize 200000)  ;adjust as needed
+	 (dest (uffi:allocate-foreign-string destsize :unsigned t))
+	 (destlen (uffi:allocate-foreign-object :long)))
+    (setf (uffi:deref-pointer destlen :long) destsize)
+    (uffi:with-cstring (source-native source)
+      (let ((result (c-uncompress dest destlen source-native sourcelen))
+	    (newdestlen (uffi:deref-pointer destlen :long)))
+	(unwind-protect
+	     (if (zerop result)
+		 (uffi:convert-from-foreign-string 
+		  dest
+		  :length newdestlen
+		  :null-terminated-p nil)
+		 (error "zlib error, code ~D" result))
+	  (progn
+	    (uffi:free-foreign-object destlen)
+	    (uffi:free-foreign-object dest)))))))
+
+#+examples-uffi
+(progn
+  (flet ((print-results (str)
+	   (multiple-value-bind (compressed len) (compress str)
+	     (let ((*print-length* nil))
+	       (format t "~&(compress ~S) => " str)
+	       (format t "~S~%" (map 'list #'char-code compressed))))))
+    (print-results "")
+    (print-results "test")
+    (print-results "test2")))
+
+#+test-uffi
+(progn
+  (flet ((test-compress (str)
+	   (multiple-value-bind (compressed len) (compress str)
+	     (multiple-value-bind (uncompressed len2) (uncompress compressed)
+	       (util.test:test str uncompressed :test #'string=
+			       :fail-info "Error uncompressing a compressed string")))))
+    (test-compress "")
+    (test-compress "test")
+    (test-compress "test2")))
+
+;; Results of the above on my system:
+;; (compress "") => 789c300001,8
+;; (compress "test") => 789c2b492d2e1045d1c1,12
+;; (compress "test2") => 789c2b492d2e31206501f3,13
-- 
2.34.1