Rename SC_INVALID_SOCKET to SC_SOCKET_NONE
For consistency with SC_PROCESS_NONE.
This commit is contained in:
@@ -10,7 +10,7 @@ net_connect_intr(struct sc_intr *intr, sc_socket socket, uint32_t addr,
|
||||
|
||||
bool ret = net_connect(socket, addr, port);
|
||||
|
||||
sc_intr_set_socket(intr, SC_INVALID_SOCKET);
|
||||
sc_intr_set_socket(intr, SC_SOCKET_NONE);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -24,7 +24,7 @@ net_listen_intr(struct sc_intr *intr, sc_socket socket, uint32_t addr,
|
||||
|
||||
bool ret = net_listen(socket, addr, port, backlog);
|
||||
|
||||
sc_intr_set_socket(intr, SC_INVALID_SOCKET);
|
||||
sc_intr_set_socket(intr, SC_SOCKET_NONE);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -32,12 +32,12 @@ sc_socket
|
||||
net_accept_intr(struct sc_intr *intr, sc_socket server_socket) {
|
||||
if (!sc_intr_set_socket(intr, server_socket)) {
|
||||
// Already interrupted
|
||||
return SC_INVALID_SOCKET;
|
||||
return SC_SOCKET_NONE;
|
||||
}
|
||||
|
||||
sc_socket socket = net_accept(server_socket);
|
||||
|
||||
sc_intr_set_socket(intr, SC_INVALID_SOCKET);
|
||||
sc_intr_set_socket(intr, SC_SOCKET_NONE);
|
||||
return socket;
|
||||
}
|
||||
|
||||
@@ -50,7 +50,7 @@ net_recv_intr(struct sc_intr *intr, sc_socket socket, void *buf, size_t len) {
|
||||
|
||||
ssize_t r = net_recv(socket, buf, len);
|
||||
|
||||
sc_intr_set_socket(intr, SC_INVALID_SOCKET);
|
||||
sc_intr_set_socket(intr, SC_SOCKET_NONE);
|
||||
return r;
|
||||
}
|
||||
|
||||
@@ -64,7 +64,7 @@ net_recv_all_intr(struct sc_intr *intr, sc_socket socket, void *buf,
|
||||
|
||||
ssize_t r = net_recv_all(socket, buf, len);
|
||||
|
||||
sc_intr_set_socket(intr, SC_INVALID_SOCKET);
|
||||
sc_intr_set_socket(intr, SC_SOCKET_NONE);
|
||||
return r;
|
||||
}
|
||||
|
||||
@@ -78,7 +78,7 @@ net_send_intr(struct sc_intr *intr, sc_socket socket, const void *buf,
|
||||
|
||||
ssize_t w = net_send(socket, buf, len);
|
||||
|
||||
sc_intr_set_socket(intr, SC_INVALID_SOCKET);
|
||||
sc_intr_set_socket(intr, SC_SOCKET_NONE);
|
||||
return w;
|
||||
}
|
||||
|
||||
@@ -92,6 +92,6 @@ net_send_all_intr(struct sc_intr *intr, sc_socket socket, const void *buf,
|
||||
|
||||
ssize_t w = net_send_all(socket, buf, len);
|
||||
|
||||
sc_intr_set_socket(intr, SC_INVALID_SOCKET);
|
||||
sc_intr_set_socket(intr, SC_SOCKET_NONE);
|
||||
return w;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user