Cleanup in callback marshalers

[clg] / glib / gforeign.lisp

diff --git a/glib/gforeign.lisp b/glib/gforeign.lisp
index 2330195..48cd686 100644 (file)
--- a/glib/gforeign.lisp
+++ b/glib/gforeign.lisp
@@ -15,7 +15,7 @@
 ;; License along with this library; if not, write to the Free Software
 ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-;; $Id: gforeign.lisp,v 1.11 2001/10/21 16:50:43 espen Exp $
+;; $Id: gforeign.lisp,v 1.13 2002/03/19 17:03:42 espen Exp $
 
 (in-package "GLIB")
 
@@ -346,6 +346,7 @@
     (let ((alien-funcall `(alien-funcall ,lisp-name ,@(alien-parameters))))
       `(defun ,lisp-name ,lambda-list
         ,@docs
+        (declare (optimize (ext:inhibit-warnings 3)))
         (with-alien ((,lisp-name
                       (function
                        ,(translate-type-spec return-type-spec)
@@ -395,19 +396,17 @@
 (defun mkbinding-late (name return-type &rest arg-types)
   (if (every-type-translateable-p (cons return-type arg-types))
       (apply #'mkbinding name return-type arg-types)
-    (let* ((binding
-           #'(lambda (&rest args)
-               (cond
-                ((every-type-translateable-p (cons return-type arg-types))
-                 (setq binding (apply #'mkbinding name return-type arg-types))
-                 (apply binding args))
-                (t
-                 (dolist (type-spec (cons return-type arg-types))
-                   (unless (type-translateable-p type-spec)
-                     (error "Can't translate type ~A" type-spec))))))))
+    (let ((binding nil))
       #'(lambda (&rest args)
-         (apply binding args)))))
-       
+         (cond
+          (binding (apply binding args))
+          ((every-type-translateable-p (cons return-type arg-types))
+           (setq binding (apply #'mkbinding name return-type arg-types))
+           (apply binding args))
+          (t
+           (dolist (type-spec (cons return-type arg-types))
+             (unless (type-translateable-p type-spec)
+               (error "Can't translate type ~A" type-spec)))))))))