Diff: Socket.cpp

Branch:

api-changes

Revision:

45:c8aca7c1e93f

Parent:

43:09ea32f2eb54

Child:

48:b3bbe28a7963

--- a/Socket.cpp	Wed Feb 24 22:18:51 2016 -0600
+++ b/Socket.cpp	Wed Feb 24 23:05:54 2016 -0600
@@ -35,10 +35,6 @@
 
 int32_t Socket::setURL(const char *url)
 {
-    if (!_iface) {
-        return -4;
-    }
-
     int32_t err = _iface->getHostByName(url, _ip_address);
     if (err) {
         return err;
@@ -101,10 +97,6 @@
         return err;
     }
 
-    if (!_iface) {
-        return -4;
-    }
-
     if (address) {
         err = setURL(address);
         if (err) {
@@ -117,12 +109,12 @@
     }
 
     if (!getIPAddress() || !getPort()) {
-        return -3;
+        return NS_ERROR_NO_ADDRESS;
     }
 
     _socket = _iface->createSocket(_proto);
     if (!_socket) {
-        return -2;
+        return NS_ERROR_NO_SOCKET;
     }
 
     err = _socket->open(_ip_address, _port);
@@ -152,7 +144,7 @@
 int32_t Socket::send(const void *data, uint32_t len)
 {
     if (!_socket) {
-        return -2;
+        return NS_ERROR_NO_CONNECTION;
     }
     return _socket->send(data, len);
 }
@@ -160,7 +152,7 @@
 int32_t Socket::recv(void *data, uint32_t len)
 {
     if (!_socket) {
-        return -2;
+        return NS_ERROR_NO_CONNECTION;
     }
     return _socket->recv(data, len);
 }