[ovs-dev] [so_error 3/3] socket-util: Remove get_socket_error().

Ben Pfaff blp at nicira.com
Mon Nov 19 23:57:47 UTC 2012


It has no remaining users.

Signed-off-by: Ben Pfaff <blp at nicira.com>
---
 lib/socket-util.c         |   13 -------------
 lib/socket-util.h         |    1 -
 python/ovs/socket_util.py |    6 ------
 3 files changed, 0 insertions(+), 20 deletions(-)

diff --git a/lib/socket-util.c b/lib/socket-util.c
index 4843cc5..48f42f1 100644
--- a/lib/socket-util.c
+++ b/lib/socket-util.c
@@ -205,19 +205,6 @@ lookup_hostname(const char *host_name, struct in_addr *addr)
             : EINVAL);
 }
 
-/* Returns the error condition associated with socket 'fd' and resets the
- * socket's error status. */
-int
-get_socket_error(int fd)
-{
-    int error;
-
-    if (getsockopt_int(fd, SOL_SOCKET, SO_ERROR, "SO_ERROR", &error)) {
-        error = errno;
-    }
-    return error;
-}
-
 int
 check_connection_completion(int fd)
 {
diff --git a/lib/socket-util.h b/lib/socket-util.h
index a00b32e..5bf8529 100644
--- a/lib/socket-util.h
+++ b/lib/socket-util.h
@@ -36,7 +36,6 @@ int lookup_ipv6(const char *host_name, struct in6_addr *address);
 
 int lookup_hostname(const char *host_name, struct in_addr *);
 
-int get_socket_error(int sock);
 int get_socket_rcvbuf(int sock);
 int check_connection_completion(int fd);
 int drain_rcvbuf(int fd);
diff --git a/python/ovs/socket_util.py b/python/ovs/socket_util.py
index e6b6fce..8fecbc7 100644
--- a/python/ovs/socket_util.py
+++ b/python/ovs/socket_util.py
@@ -133,12 +133,6 @@ def inet_open_active(style, target, default_port, dscp):
         return get_exception_errno(e), None
 
 
-def get_socket_error(sock):
-    """Returns the errno value associated with 'socket' (0 if no error) and
-    resets the socket's error status."""
-    return sock.getsockopt(socket.SOL_SOCKET, socket.SO_ERROR)
-
-
 def get_exception_errno(e):
     """A lot of methods on Python socket objects raise socket.error, but that
     exception is documented as having two completely different forms of
-- 
1.7.2.5




More information about the dev mailing list