From a47a7fa6e6164ab94ea7b3c9e0025a062c44fcde Mon Sep 17 00:00:00 2001 From: Andreas Fuchs Date: Mon, 31 May 2004 16:11:40 +0000 Subject: [PATCH] 0.8.10.70: Fix undefined variable usage by socket-peername in sb-bsd-sockets ... also rework the with-sockaddr-for macro to make some uses of it more readable --- contrib/sb-bsd-sockets/sockets.lisp | 10 +++++----- version.lisp-expr | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/sb-bsd-sockets/sockets.lisp b/contrib/sb-bsd-sockets/sockets.lisp index 6c68594..caaccc8 100644 --- a/contrib/sb-bsd-sockets/sockets.lisp +++ b/contrib/sb-bsd-sockets/sockets.lisp @@ -53,7 +53,7 @@ When SOCKADDR is passed, it is used instead of a new object.")) (:documentation "Deallocate a Socket Address object that was created for SOCKET.")) -(defmacro with-sockaddr-for ((socket sockaddr sockaddr-args) &body body) +(defmacro with-sockaddr-for ((socket sockaddr &optional sockaddr-args) &body body) `(let ((,sockaddr (apply #'make-sockaddr-for ,socket nil ,sockaddr-args))) (unwind-protect (progn ,@body) (free-sockaddr-for ,socket ,sockaddr)))) @@ -84,7 +84,7 @@ newly-created connected socket and the peer address as multiple values")) (defmethod socket-accept ((socket socket)) - (with-sockaddr-for (socket sockaddr nil) + (with-sockaddr-for (socket sockaddr) (let ((fd (sockint::accept (socket-file-descriptor socket) sockaddr (size-of-sockaddr socket)))) @@ -115,7 +115,7 @@ values")) family this may return multiple values")) (defmethod socket-peername ((socket socket)) - (with-sockaddr-for (socket sockaddr address) + (with-sockaddr-for (socket sockaddr) (when (= (sockint::getpeername (socket-file-descriptor socket) sockaddr (size-of-sockaddr socket)) @@ -128,7 +128,7 @@ values")) that the socket is bound to, as multiple values.")) (defmethod socket-name ((socket socket)) - (with-sockaddr-for (socket sockaddr nil) + (with-sockaddr-for (socket sockaddr) (when (= (sockint::getsockname (socket-file-descriptor socket) sockaddr (size-of-sockaddr socket)) @@ -159,7 +159,7 @@ small")) &key oob peek waitall (element-type 'character)) - (with-sockaddr-for (socket sockaddr nil) + (with-sockaddr-for (socket sockaddr) (let ((flags (logior (if oob sockint::MSG-OOB 0) (if peek sockint::MSG-PEEK 0) diff --git a/version.lisp-expr b/version.lisp-expr index c35ee82..68093b7 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"0.8.10.69" +"0.8.10.70" -- 1.7.10.4