Changeset b7fd2a0 in mainline for uspace/lib/c/generic/inet.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/lib/c/generic/inet.c (modified) (12 diffs)

uspace/lib/c/generic/inet.c

@@ -42 +42 @@
 static uint8_t inet_protocol = 0;
 
-static int inet_callback_create(void)
+static errno_t inet_callback_create(void)
 {
         async_exch_t *exch = async_exchange_begin(inet_sess);
@@ -50 +50 @@
         
         port_id_t port;
-        int rc = async_create_callback_port(exch, INTERFACE_INET_CB, 0, 0,
+        errno_t rc = async_create_callback_port(exch, INTERFACE_INET_CB, 0, 0,
             inet_cb_conn, NULL, &port);
         
@@ -58 +58 @@
                 return rc;
         
-        int retval;
+        errno_t retval;
         async_wait_for(req, &retval);
         
@@ -64 +64 @@
 }
 
-static int inet_set_proto(uint8_t protocol)
-{
-        async_exch_t *exch = async_exchange_begin(inet_sess);
-        int rc = async_req_1_0(exch, INET_SET_PROTO, protocol);
+static errno_t inet_set_proto(uint8_t protocol)
+{
+        async_exch_t *exch = async_exchange_begin(inet_sess);
+        errno_t rc = async_req_1_0(exch, INET_SET_PROTO, protocol);
         async_exchange_end(exch);
         
@@ -73 +73 @@
 }
 
-int inet_init(uint8_t protocol, inet_ev_ops_t *ev_ops)
+errno_t inet_init(uint8_t protocol, inet_ev_ops_t *ev_ops)
 {
         service_id_t inet_svc;
-        int rc;
+        errno_t rc;
 
         assert(inet_sess == NULL);
@@ -110 +110 @@
 }
 
-int inet_send(inet_dgram_t *dgram, uint8_t ttl, inet_df_t df)
+errno_t inet_send(inet_dgram_t *dgram, uint8_t ttl, inet_df_t df)
 {
         async_exch_t *exch = async_exchange_begin(inet_sess);
@@ -118 +118 @@
             ttl, df, &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);
@@ -141 +141 @@
         }
         
-        int retval;
+        errno_t retval;
         async_wait_for(req, &retval);
         
@@ -147 +147 @@
 }
 
-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)
 {
         async_exch_t *exch = async_exchange_begin(inet_sess);
@@ -154 +154 @@
         aid_t req = async_send_1(exch, INET_GET_SRCADDR, tos, &answer);
         
-        int rc = async_data_write_start(exch, remote, sizeof(inet_addr_t));
+        errno_t rc = async_data_write_start(exch, remote, sizeof(inet_addr_t));
         if (rc != EOK) {
                 async_exchange_end(exch);
@@ -170 +170 @@
         }
         
-        int retval;
+        errno_t retval;
         async_wait_for(req, &retval);
         
@@ -197 +197 @@
         }
         
-        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);