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

uspace/srv/net/inetsrv/icmp.c

@@ -50 +50 @@
 #define INET_TTL_MAX 255
 
-static int icmp_recv_echo_request(inet_dgram_t *);
-static int icmp_recv_echo_reply(inet_dgram_t *);
+static errno_t icmp_recv_echo_request(inet_dgram_t *);
+static errno_t icmp_recv_echo_reply(inet_dgram_t *);
 
-int icmp_recv(inet_dgram_t *dgram)
+errno_t icmp_recv(inet_dgram_t *dgram)
 {
         uint8_t type;
@@ -76 +76 @@
 }
 
-static int icmp_recv_echo_request(inet_dgram_t *dgram)
+static errno_t icmp_recv_echo_request(inet_dgram_t *dgram)
 {
         icmp_echo_t *request, *reply;
@@ -82 +82 @@
         size_t size;
         inet_dgram_t rdgram;
-        int rc;
+        errno_t rc;
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "icmp_recv_echo_request()");
@@ -119 +119 @@
 }
 
-static int icmp_recv_echo_reply(inet_dgram_t *dgram)
+static errno_t icmp_recv_echo_reply(inet_dgram_t *dgram)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "icmp_recv_echo_reply()");
@@ -141 +141 @@
 }
 
-int icmp_ping_send(uint16_t ident, inetping_sdu_t *sdu)
+errno_t icmp_ping_send(uint16_t ident, inetping_sdu_t *sdu)
 {
         size_t rsize = sizeof(icmp_echo_t) + sdu->size;
@@ -170 +170 @@
         dgram.size = rsize;
 
-        int rc = inet_route_packet(&dgram, IP_PROTO_ICMP, INET_TTL_MAX, 0);
+        errno_t rc = inet_route_packet(&dgram, IP_PROTO_ICMP, INET_TTL_MAX, 0);
 
         free(rdata);