Remove the now-obsolete check_state method

diff --git a/source/datagramsocket.cpp b/source/datagramsocket.cpp
index e15a1d143c0281cc9686abd9b4e36a1da97a168c..1368d153feb87aa7c574dfc4abb3ebdea01f6314 100644 (file)
--- a/source/datagramsocket.cpp
+++ b/source/datagramsocket.cpp
@@ -17,8 +17,6 @@ DatagramSocket::DatagramSocket(Family f, int p):
 
 int DatagramSocket::connect(const SockAddr &addr)
 {
-       check_state(false);
-
        sockaddr_storage sa;
        socklen_t size = addr.fill_sockaddr(sa);
 
@@ -47,8 +45,6 @@ int DatagramSocket::connect(const SockAddr &addr)
 
 unsigned DatagramSocket::sendto(const char *buf, unsigned size, const SockAddr &addr_)
 {
-       check_state(false);
-
        if(size==0)
                return 0;
 
@@ -75,8 +71,6 @@ unsigned DatagramSocket::sendto(const char *buf, unsigned size, const SockAddr &
 
 unsigned DatagramSocket::recvfrom(char *buf, unsigned size, SockAddr *&addr_)
 {
-       check_state(false);
-
        if(size==0)
                return 0;
 

diff --git a/source/socket.cpp b/source/socket.cpp
index 7bccec6de1303997f07883898ea947b99fd12ba4..b6ab2e8edac2e49b2a1a203d66b25b85a2b27e81 100644 (file)
--- a/source/socket.cpp
+++ b/source/socket.cpp
@@ -108,8 +108,6 @@ const IO::Handle &Socket::get_event_handle()
 
 void Socket::bind(const SockAddr &addr)
 {
-       check_state(false);
-
        sockaddr_storage sa;
        unsigned size = addr.fill_sockaddr(sa);
 
@@ -148,12 +146,6 @@ const SockAddr &Socket::get_peer_address() const
        return *peer_addr;
 }
 
-void Socket::check_state(bool conn) const
-{
-       if(conn && !connected)
-               throw bad_socket_state("not connected");
-}
-
 int Socket::set_option(int level, int optname, const void *optval, socklen_t optlen)
 {
 #ifdef WIN32
@@ -174,7 +166,8 @@ int Socket::get_option(int level, int optname, void *optval, socklen_t *optlen)
 
 unsigned Socket::do_write(const char *buf, unsigned size)
 {
-       check_state(true);
+       if(!connected)
+               throw bad_socket_state("not connected");
 
        if(size==0)
                return 0;
@@ -193,7 +186,9 @@ unsigned Socket::do_write(const char *buf, unsigned size)
 
 unsigned Socket::do_read(char *buf, unsigned size)
 {
-       check_state(true);
+       if(!connected)
+               throw bad_socket_state("not connected");
+
 
        if(size==0)
                return 0;

diff --git a/source/socket.h b/source/socket.h
index dbe31512a6f677eeed424d3a12748a50d8fc87eb..6eb29066e03d078a469f897c79c99f35a19ebcbe 100644 (file)
--- a/source/socket.h
+++ b/source/socket.h
@@ -49,7 +49,6 @@ public:
        const SockAddr &get_local_address() const;
        const SockAddr &get_peer_address() const;
 protected:
-       void check_state(bool) const;
        int set_option(int, int, const void *, socklen_t);
        int get_option(int, int, void *, socklen_t *) const;
        unsigned do_write(const char *, unsigned);

diff --git a/source/streamsocket.cpp b/source/streamsocket.cpp
index cd810d5253e14e2990d204c4af12096f5be7278b..59590846f16d0661917b4134b4b6aaa9ef919abb 100644 (file)
--- a/source/streamsocket.cpp
+++ b/source/streamsocket.cpp
@@ -27,7 +27,6 @@ StreamSocket::StreamSocket(Family af, int proto):
 
 int StreamSocket::poll_connect(const Time::TimeDelta &timeout)
 {
-       check_state(false);
        if(!connecting)
                throw bad_socket_state("not connecting");
 
@@ -71,8 +70,6 @@ int StreamSocket::poll_connect(const Time::TimeDelta &timeout)
 
 int StreamSocket::connect(const SockAddr &addr)
 {
-       check_state(false);
-
        if(connected)
                throw bad_socket_state("already connected");