From 77378d36f07fe1f11893444217716b01628a329f Mon Sep 17 00:00:00 2001
From: "Kevin M. Rosenberg" <kevin@rosenberg.net>
Date: Mon, 2 Dec 2002 13:21:43 +0000
Subject: [PATCH] r3530: *** empty log message ***

---
 debian/changelog          | 6 ++++++
 examples/gethostname.lisp | 5 +++--
 src/aggregates.lisp       | 4 ++--
 src/objects.lisp          | 6 +++---
 tests/gethostname.lisp    | 5 +++--
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 36e8077..5b1a8ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-uffi (1.1.8-1) unstable; urgency=low
+
+  * Reverse broken bug "fixes" 
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Thu, 28 Nov 2002 11:47:26 -0700
+
 cl-uffi (1.1.7.1-1) unstable; urgency=low
 
   * Another allegro bug (Thanks Matthew Danish)
diff --git a/examples/gethostname.lisp b/examples/gethostname.lisp
index 04fa797..a6e1b0e 100644
--- a/examples/gethostname.lisp
+++ b/examples/gethostname.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: gethostname.lisp,v 1.2 2002/11/25 19:04:57 kevin Exp $
+;;;; $Id: gethostname.lisp,v 1.3 2002/12/02 13:21:43 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -34,7 +34,8 @@
 		     (uffi:convert-from-foreign-string name))))
     (uffi:free-foreign-object name)
     (unless (zerop result-code)
-      (error "gethostname() failed."))))
+      (error "gethostname() failed."))
+    hostname))
 
 (defun gethostname2 ()
   "Returns the hostname"
diff --git a/src/aggregates.lisp b/src/aggregates.lisp
index e22f22b..5080222 100644
--- a/src/aggregates.lisp
+++ b/src/aggregates.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: aggregates.lisp,v 1.5 2002/11/23 19:07:11 kevin Exp $
+;;;; $Id: aggregates.lisp,v 1.6 2002/12/02 13:21:43 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -163,7 +163,7 @@ of the enum-name name, separator-string, and field-name"
   #+(or cmu scl)  `(alien:deref ,obj ,i)
   #+sbcl  `(sb-alien:deref ,obj ,i)
   #+lispworks `(fli:dereference ,obj :index ,i)
-  #+allegro `(ff:fslot-value-typed (quote (convert-from-uffi-type ,type :type)) :c ,obj ,i)
+  #+allegro `(ff:fslot-value-typed (quote ,(convert-from-uffi-type type :type)) :c ,obj ,i)
   #+mcl
   (let* ((array-type (array-type type))
          (local-type (convert-from-uffi-type array-type :allocation))
diff --git a/src/objects.lisp b/src/objects.lisp
index 6c7a745..8c6d2ac 100644
--- a/src/objects.lisp
+++ b/src/objects.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: objects.lisp,v 1.6 2002/11/23 18:01:57 kevin Exp $
+;;;; $Id: objects.lisp,v 1.7 2002/12/02 13:21:43 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -108,8 +108,8 @@ an array of TYPE with size SIZE. The TYPE parameter is evaluated."
   #+(or cmu scl)  `(alien:deref ,ptr)
   #+sbcl  `(sb-alien:deref ,ptr)
   #+lispworks `(fli:dereference ,ptr)
-  #+allegro `(ff:fslot-value-typed (convert-from-uffi-type ,type :deref) :c ,ptr)
-  #+mcl `(ccl:pref ,ptr (convert-from-uffi-type ,type :deref))
+  #+allegro `(ff:fslot-value-typed (quote ,(convert-from-uffi-type type :deref)) :c ,ptr)
+  #+mcl `(ccl:pref ,ptr ,(convert-from-uffi-type type :deref))
   )
 
 #+mcl
diff --git a/tests/gethostname.lisp b/tests/gethostname.lisp
index 04fa797..a6e1b0e 100644
--- a/tests/gethostname.lisp
+++ b/tests/gethostname.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: gethostname.lisp,v 1.2 2002/11/25 19:04:57 kevin Exp $
+;;;; $Id: gethostname.lisp,v 1.3 2002/12/02 13:21:43 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -34,7 +34,8 @@
 		     (uffi:convert-from-foreign-string name))))
     (uffi:free-foreign-object name)
     (unless (zerop result-code)
-      (error "gethostname() failed."))))
+      (error "gethostname() failed."))
+    hostname))
 
 (defun gethostname2 ()
   "Returns the hostname"
-- 
2.34.1