From 1c24175024c8df3087d5f6d911a35f1acb2bfc24 Mon Sep 17 00:00:00 2001 From: Stelian Ionescu Date: Wed, 2 Jan 2008 03:23:40 +0100 Subject: [PATCH] Minor fixes. Signed-off-by: Stelian Ionescu --- sockets/common.lisp | 39 +++++++++++++++++++-------------------- sockets/make-socket.lisp | 3 +-- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/sockets/common.lisp b/sockets/common.lisp index 0cbebd6..4d16ad0 100644 --- a/sockets/common.lisp +++ b/sockets/common.lisp @@ -246,23 +246,22 @@ (defmacro multiple-value-case (values &body body) (setf values (ensure-list values)) (assert values () "Must provide at least one value to test") - (let ((len (length values))) - (labels ((%do-var (var val) - (cond - ((and (symbolp var) (string= var "_")) - t) - ((consp var) - `(memq ,val ',var)) - (t - `(eq ,val ',var)))) - (%do-clause (c) - (destructuring-bind ((&rest vals) &rest code) c - `((and ,@(mapcar #'%do-var vals values)) ,@code))) - (%do-last-clause (c) - (when c - (destructuring-bind (test &rest code) c - (if (member test '(otherwise t)) - `((t ,@code)) - `(,(%do-clause c))))))) - `(cond ,@(append (mapcar #'%do-clause (butlast body)) - (%do-last-clause (car (last body)))))))) + (labels ((%do-var (var val) + (cond + ((and (symbolp var) (string= var "_")) + t) + ((consp var) + `(memq ,val ',var)) + (t + `(eq ,val ',var)))) + (%do-clause (c) + (destructuring-bind ((&rest vals) &rest code) c + `((and ,@(mapcar #'%do-var vals values)) ,@code))) + (%do-last-clause (c) + (when c + (destructuring-bind (test &rest code) c + (if (member test '(otherwise t)) + `((t ,@code)) + `(,(%do-clause c))))))) + `(cond ,@(append (mapcar #'%do-clause (butlast body)) + (%do-last-clause (car (last body))))))) diff --git a/sockets/make-socket.lisp b/sockets/make-socket.lisp index a223f3b..c83fbb6 100644 --- a/sockets/make-socket.lisp +++ b/sockets/make-socket.lisp @@ -84,8 +84,7 @@ remaining address list as the second return value." (socket-listen socket :backlog backlog)))))) (defun %make-local-stream-active-socket (args family ef) - (destructuring-bind (&key local-filename remote-filename - (backlog *default-backlog-size*)) + (destructuring-bind (&key local-filename remote-filename) args (%with-close-on-error (socket (create-socket family :stream :active ef)) (when local-filename -- 2.11.4.GIT