Changeset b7fd2a0 in mainline for uspace/srv/net/slip/slip.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/slip/slip.c (modified) (16 diffs)

uspace/srv/net/slip/slip.c

@@ -57 +57 @@
 #define SLIP_ESC_ESC    0335
 
-static int slip_open(iplink_srv_t *);
-static int slip_close(iplink_srv_t *);
-static int slip_send(iplink_srv_t *, iplink_sdu_t *);
-static int slip_send6(iplink_srv_t *, iplink_sdu6_t *);
-static int slip_get_mtu(iplink_srv_t *, size_t *);
-static int slip_get_mac48(iplink_srv_t *, addr48_t *);
-static int slip_addr_add(iplink_srv_t *, inet_addr_t *);
-static int slip_addr_remove(iplink_srv_t *, inet_addr_t *);
+static errno_t slip_open(iplink_srv_t *);
+static errno_t slip_close(iplink_srv_t *);
+static errno_t slip_send(iplink_srv_t *, iplink_sdu_t *);
+static errno_t slip_send6(iplink_srv_t *, iplink_sdu6_t *);
+static errno_t slip_get_mtu(iplink_srv_t *, size_t *);
+static errno_t slip_get_mac48(iplink_srv_t *, addr48_t *);
+static errno_t slip_addr_add(iplink_srv_t *, inet_addr_t *);
+static errno_t slip_addr_remove(iplink_srv_t *, inet_addr_t *);
 
 static iplink_srv_t slip_iplink;
@@ -86 +86 @@
 static size_t slip_recv_read;
 
-int slip_open(iplink_srv_t *srv)
+errno_t slip_open(iplink_srv_t *srv)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "slip_open()");
@@ -92 +92 @@
 }
 
-int slip_close(iplink_srv_t *srv)
+errno_t slip_close(iplink_srv_t *srv)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "slip_close()");
@@ -103 +103 @@
 
         while (slip_send_pending > 0) {
-                int rc;
+                errno_t rc;
                 size_t nwr;
 
@@ -126 +126 @@
 }
 
-int slip_send(iplink_srv_t *srv, iplink_sdu_t *sdu)
+errno_t slip_send(iplink_srv_t *srv, iplink_sdu_t *sdu)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "slip_send()");
@@ -162 +162 @@
 }
 
-int slip_send6(iplink_srv_t *srv, iplink_sdu6_t *sdu)
+errno_t slip_send6(iplink_srv_t *srv, iplink_sdu6_t *sdu)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "slip_send6()");
@@ -169 +169 @@
 }
 
-int slip_get_mtu(iplink_srv_t *srv, size_t *mtu)
+errno_t slip_get_mtu(iplink_srv_t *srv, size_t *mtu)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "slip_get_mtu()");
@@ -176 +176 @@
 }
 
-int slip_get_mac48(iplink_srv_t *src, addr48_t *mac)
+errno_t slip_get_mac48(iplink_srv_t *src, addr48_t *mac)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "slip_get_mac48()");
@@ -182 +182 @@
 }
 
-int slip_addr_add(iplink_srv_t *srv, inet_addr_t *addr)
+errno_t slip_addr_add(iplink_srv_t *srv, inet_addr_t *addr)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "slip_addr_add()");
@@ -188 +188 @@
 }
 
-int slip_addr_remove(iplink_srv_t *srv, inet_addr_t *addr)
+errno_t slip_addr_remove(iplink_srv_t *srv, inet_addr_t *addr)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "slip_addr_remove()");
@@ -208 +208 @@
 {
         while (slip_recv_pending == 0) {
-                int rc;
+                errno_t rc;
                 size_t nread;
 
@@ -228 +228 @@
 }
 
-static int slip_recv_fibril(void *arg)
+static errno_t slip_recv_fibril(void *arg)
 {
         chardev_t *chardev = (chardev_t *) arg;
@@ -234 +234 @@
         iplink_recv_sdu_t sdu;
         uint8_t ch;
-        int rc;
+        errno_t rc;
 
         sdu.data = recv_final;
@@ -294 +294 @@
 }
 
-static int slip_init(const char *svcstr, const char *linkstr)
+static errno_t slip_init(const char *svcstr, const char *linkstr)
 {
         service_id_t svcid;
@@ -304 +304 @@
         chardev_t *chardev_out = NULL;
         fid_t fid;
-        int rc;
+        errno_t rc;
 
         iplink_srv_init(&slip_iplink);
@@ -415 +415 @@
 int main(int argc, char *argv[])
 {
-        int rc;
+        errno_t rc;
 
         printf(NAME ": IP over serial line service\n");