Changeset b7fd2a0 in mainline for uspace/srv/net/inetsrv/inetsrv.c

Timestamp:

2018-01-13T03:10:29Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a53ed3a

Parents:

36f0738

Message:

Use errno_t in all uspace and kernel code.

Change type of every variable, parameter and return value that holds an
<errno.h> constant to either errno_t (the usual case), or sys_errno_t
(some places in kernel). This is for the purpose of self-documentation,
as well as for type-checking with a bit of type definition hackery.

Although this is a massive commit, it is a simple text replacement, and thus
is very easy to verify. Simply do the following:

`
git checkout <this commit's hash>
git reset HEAD
<sup>git add .
tools/srepl '\berrno_t\b' int
git add .
tools/srepl '\bsys_errno_t\b' sysarg_t
git reset
git diff
`</sup>

While this doesn't ensure that the replacements are correct, it does ensure
that the commit doesn't do anything except those replacements. Since errno_t
is typedef'd to int in the usual case (and sys_errno_t to sysarg_t), even if
incorrect, this commit cannot change behavior.

File:

• uspace/srv/net/inetsrv/inetsrv.c (modified) (13 diffs)

uspace/srv/net/inetsrv/inetsrv.c

@@ -84 +84 @@
 static void inet_default_conn(ipc_callid_t, ipc_call_t *, void *);
 
-static int inet_init(void)
+static errno_t inet_init(void)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_init()");
         
         port_id_t port;
-        int rc = async_create_port(INTERFACE_INET,
+        errno_t rc = async_create_port(INTERFACE_INET,
             inet_default_conn, NULL, &port);
         if (rc != EOK)
@@ -135 +135 @@
 }
 
-static int inet_find_dir(inet_addr_t *src, inet_addr_t *dest, uint8_t tos,
+static errno_t inet_find_dir(inet_addr_t *src, inet_addr_t *dest, uint8_t tos,
     inet_dir_t *dir)
 {
@@ -165 +165 @@
 }
 
-int inet_route_packet(inet_dgram_t *dgram, uint8_t proto, uint8_t ttl,
+errno_t inet_route_packet(inet_dgram_t *dgram, uint8_t proto, uint8_t ttl,
     int df)
 {
         inet_dir_t dir;
         inet_link_t *ilink;
-        int rc;
+        errno_t rc;
 
         if (dgram->iplink != 0) {
@@ -201 +201 @@
 }
 
-static int inet_send(inet_client_t *client, inet_dgram_t *dgram,
+static errno_t inet_send(inet_client_t *client, inet_dgram_t *dgram,
     uint8_t proto, uint8_t ttl, int df)
 {
@@ -207 +207 @@
 }
 
-int inet_get_srcaddr(inet_addr_t *remote, uint8_t tos, inet_addr_t *local)
+errno_t inet_get_srcaddr(inet_addr_t *remote, uint8_t tos, inet_addr_t *local)
 {
         inet_dir_t dir;
-        int rc;
+        errno_t rc;
 
         rc = inet_find_dir(NULL, remote, tos, &dir);
@@ -252 +252 @@
         
         inet_addr_t remote;
-        int rc = async_data_write_finalize(callid, &remote, size);
+        errno_t rc = async_data_write_finalize(callid, &remote, size);
         if (rc != EOK) {
                 async_answer_0(callid, rc);
@@ -314 +314 @@
         }
         
-        int rc = async_data_write_finalize(callid, &dgram.src, size);
+        errno_t rc = async_data_write_finalize(callid, &dgram.src, size);
         if (rc != EOK) {
                 async_answer_0(callid, rc);
@@ -445 +445 @@
 }
 
-int inet_ev_recv(inet_client_t *client, inet_dgram_t *dgram)
+errno_t inet_ev_recv(inet_client_t *client, inet_dgram_t *dgram)
 {
         async_exch_t *exch = async_exchange_begin(client->sess);
@@ -457 +457 @@
             dgram->iplink, &answer);
 
-        int rc = async_data_write_start(exch, &dgram->src, sizeof(inet_addr_t));
+        errno_t rc = async_data_write_start(exch, &dgram->src, sizeof(inet_addr_t));
         if (rc != EOK) {
                 async_exchange_end(exch);
@@ -480 +480 @@
         }
 
-        int retval;
+        errno_t retval;
         async_wait_for(req, &retval);
 
@@ -486 +486 @@
 }
 
-int inet_recv_dgram_local(inet_dgram_t *dgram, uint8_t proto)
+errno_t inet_recv_dgram_local(inet_dgram_t *dgram, uint8_t proto)
 {
         inet_client_t *client;
@@ -509 +509 @@
 }
 
-int inet_recv_packet(inet_packet_t *packet)
+errno_t inet_recv_packet(inet_packet_t *packet)
 {
         inet_addrobj_t *addr;
@@ -543 +543 @@
 int main(int argc, char *argv[])
 {
-        int rc;
+        errno_t rc;
 
         printf(NAME ": HelenOS Internet Protocol service\n");