From eaee1ec44eebb1816919e9403aaf82476b37a866 Mon Sep 17 00:00:00 2001
From: Stelian Ionescu <sionescu@common-lisp.net>
Date: Sat, 3 Feb 2007 18:39:07 +0100
Subject: [PATCH] Fixed slot names.

---
 io-multiplex/utils.lisp     | 12 ++++++------
 sockets/address.lisp        |  2 +-
 sockets/common.lisp         | 16 ++++++++--------
 sockets/socket-methods.lisp |  2 +-
 sockets/socket-options.lisp | 10 +++++-----
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/io-multiplex/utils.lisp b/io-multiplex/utils.lisp
index 47a17ab..c5b6d96 100644
--- a/io-multiplex/utils.lisp
+++ b/io-multiplex/utils.lisp
@@ -22,17 +22,17 @@
 (in-package :io.multiplex)
 
 (defun timeout->timeval (timeout tv)
-  (with-foreign-slots ((et:tv-sec et:tv-usec) tv et:timeval)
+  (with-foreign-slots ((et:sec et:usec) tv et:timeval)
     (multiple-value-bind (sec usec) (decode-timeout timeout)
-     (setf et:tv-sec  sec
-           et:tv-usec usec))))
+     (setf et:sec  sec
+           et:usec usec))))
 
 
 (defun timeout->timespec (timeout ts)
-  (with-foreign-slots ((et:ts-sec et:ts-nsec) ts et:timespec)
+  (with-foreign-slots ((et:sec et:nsec) ts et:timespec)
     (multiple-value-bind (sec usec) (decode-timeout timeout)
-      (setf et:ts-sec sec
-            et:ts-nsec (* 1000 usec)))))
+      (setf et:sec sec
+            et:nsec (* 1000 usec)))))
 
 
 (defun timeout->milisec (timeout)
diff --git a/sockets/address.lisp b/sockets/address.lisp
index 4ffc66d..d27ede2 100644
--- a/sockets/address.lisp
+++ b/sockets/address.lisp
@@ -127,7 +127,7 @@
       (make-sockaddr-in6 sin6 vector)
       (et:inet-ntop et:af-inet6                          ; address family
                     (foreign-slot-pointer
-                      sin6 'et:sockaddr-in6 'et:address) ; pointer to struct in6_addr
+                      sin6 'et:sockaddr-in6 'et:addr)    ; pointer to struct in6_addr
                     namebuf                              ; destination buffer
                     bufsize)                             ; INET6_ADDRSTRLEN
       (return-from vector-to-colon-separated
diff --git a/sockets/common.lisp b/sockets/common.lisp
index 51e89c4..26924c5 100644
--- a/sockets/common.lisp
+++ b/sockets/common.lisp
@@ -119,18 +119,18 @@
 (defun make-sockaddr-in (sin ub8-vector &optional (port 0))
   (et:bzero sin et:size-of-sockaddr-in)
   (let ((tmp port))
-    (with-foreign-slots ((et:family et:address et:port) sin et:sockaddr-in)
+    (with-foreign-slots ((et:family et:addr et:port) sin et:sockaddr-in)
       (setf et:family et:af-inet)
-      (setf et:address (htonl (vector-to-ipaddr ub8-vector)))
+      (setf et:addr (htonl (vector-to-ipaddr ub8-vector)))
       (setf et:port (htons tmp))))
   sin)
 
 (defun make-sockaddr-in6 (sin6 ub16-vector &optional (port 0))
   (et:bzero sin6 et:size-of-sockaddr-in6)
   (let ((tmp port))
-    (with-foreign-slots ((et:family et:address et:port) sin6 et:sockaddr-in6)
+    (with-foreign-slots ((et:family et:addr et:port) sin6 et:sockaddr-in6)
       (setf et:family et:af-inet6)
-      (copy-simple-array-ub16-to-alien-vector ub16-vector et:address)
+      (copy-simple-array-ub16-to-alien-vector ub16-vector et:addr)
       (setf et:port (htons tmp))))
   sin6)
 
@@ -164,15 +164,15 @@
     newvector))
 
 (defun sockaddr-in->sockaddr (sin)
-  (with-foreign-slots ((et:address et:port) sin et:sockaddr-in)
+  (with-foreign-slots ((et:addr et:port) sin et:sockaddr-in)
     (values (make-instance 'ipv4addr
-                           :name (make-vector-u8-4-from-in-addr et:address))
+                           :name (make-vector-u8-4-from-in-addr et:addr))
             (ntohs et:port))))
 
 (defun sockaddr-in6->sockaddr (sin6)
-  (with-foreign-slots ((et:address et:port) sin6 et:sockaddr-in6)
+  (with-foreign-slots ((et:addr et:port) sin6 et:sockaddr-in6)
     (values (make-instance 'ipv6addr
-                           :name (make-vector-u16-8-from-in6-addr et:address))
+                           :name (make-vector-u16-8-from-in6-addr et:addr))
             (ntohs et:port))))
 
 (defun sockaddr-un->sockaddr (sun)
diff --git a/sockets/socket-methods.lisp b/sockets/socket-methods.lisp
index 8cdab51..232873e 100644
--- a/sockets/socket-methods.lisp
+++ b/sockets/socket-methods.lisp
@@ -650,5 +650,5 @@
   (with-socket-error-filter
     (with-foreign-object (sin 'et:sockaddr-in)
       (et:bzero sin et:size-of-sockaddr-in)
-      (setf (foreign-slot-value sin 'et:sockaddr-in 'et:address) et:af-unspec)
+      (setf (foreign-slot-value sin 'et:sockaddr-in 'et:addr) et:af-unspec)
       (et:connect (socket-fd socket) sin et:size-of-sockaddr-in))))
diff --git a/sockets/socket-options.lisp b/sockets/socket-options.lisp
index 6458b57..f00e389 100644
--- a/sockets/socket-options.lisp
+++ b/sockets/socket-options.lisp
@@ -52,9 +52,9 @@
 
 (defun set-socket-option-timeval (fd level option sec usec)
   (with-foreign-object (optval 'et:timeval)
-    (with-foreign-slots ((et:tv-sec et:tv-usec) optval et:timeval)
-      (setf et:tv-sec sec
-            et:tv-usec usec))
+    (with-foreign-slots ((et:sec et:usec) optval et:timeval)
+      (setf et:sec sec
+            et:usec usec))
     (et:setsockopt fd level option optval et:size-of-timeval)
     (values)))
 
@@ -89,8 +89,8 @@
                          (optlen :socklen))
     (setf (mem-ref optlen :socklen) et:size-of-timeval)
     (et:getsockopt fd level option optval optlen)
-    (with-foreign-slots ((et:tv-sec et:tv-usec) optval et:timeval)
-      (values et:tv-sec et:tv-usec))))
+    (with-foreign-slots ((et:sec et:usec) optval et:timeval)
+      (values et:sec et:usec))))
 
 
 ;;
-- 
2.11.4.GIT