From fe31e2c2919a154f44813a3cc568c09393260158 Mon Sep 17 00:00:00 2001 From: Stelian Ionescu Date: Sat, 29 Dec 2007 03:49:08 +0100 Subject: [PATCH] Rename SELECT-SOCKET-TYPE to SELECT-SOCKET-CLASS. Signed-off-by: Stelian Ionescu --- sockets/make-socket.lisp | 7 +++---- sockets/socket-methods.lisp | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/sockets/make-socket.lisp b/sockets/make-socket.lisp index c2f0452..d5c8938 100644 --- a/sockets/make-socket.lisp +++ b/sockets/make-socket.lisp @@ -28,10 +28,9 @@ (external-format :default)) (when (or (null family) (eq family :internet)) (setf family (if ipv6 :ipv6 :ipv4))) - (let ((class (select-socket-type family type connect protocol))) - (make-instance class - :family family - :external-format external-format))) + (make-instance (select-socket-class family type connect protocol) + :family family + :external-format external-format)) (defmacro %with-close-on-error ((var value) &body body) "Bind VAR to VALUE, execute BODY as implicit PROGN and return VAR. diff --git a/sockets/socket-methods.lisp b/sockets/socket-methods.lisp index f77d840..3ae394b 100644 --- a/sockets/socket-methods.lisp +++ b/sockets/socket-methods.lisp @@ -35,7 +35,7 @@ ((:ipv6 :datagram :active :default) . socket-datagram-internet-active))) ;;; FIXME: should match :default to whatever protocol is the default. -(defun select-socket-type (family type connect protocol) +(defun select-socket-class (family type connect protocol) (or (cdr (assoc (list family type connect protocol) *socket-type-map* :test #'equal)) (error "No socket class found !!"))) -- 2.11.4.GIT