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

uspace/srv/net/dhcp/dhcp.c

@@ -117 +117 @@
 
 /** Decode subnet mask into subnet prefix length. */
-static int subnet_mask_decode(uint32_t mask, int *bits)
+static errno_t subnet_mask_decode(uint32_t mask, int *bits)
 {
         int zbits;
@@ -148 +148 @@
 }
 
-static int dhcp_send_discover(dhcp_link_t *dlink)
+static errno_t dhcp_send_discover(dhcp_link_t *dlink)
 {
         dhcp_hdr_t *hdr = (dhcp_hdr_t *)msgbuf;
@@ -171 +171 @@
 }
 
-static int dhcp_send_request(dhcp_link_t *dlink, dhcp_offer_t *offer)
+static errno_t dhcp_send_request(dhcp_link_t *dlink, dhcp_offer_t *offer)
 {
         dhcp_hdr_t *hdr = (dhcp_hdr_t *)msgbuf;
@@ -212 +212 @@
 }
 
-static int dhcp_parse_reply(void *msg, size_t size, dhcp_offer_t *offer)
+static errno_t dhcp_parse_reply(void *msg, size_t size, dhcp_offer_t *offer)
 {
         dhcp_hdr_t *hdr = (dhcp_hdr_t *)msg;
@@ -225 +225 @@
         uint8_t opt_type, opt_len;
         uint8_t *msgb;
-        int rc;
+        errno_t rc;
         size_t i;
 
@@ -360 +360 @@
 }
 
-static int dhcp_cfg_create(service_id_t iplink, dhcp_offer_t *offer)
-{
-        int rc;
+static errno_t dhcp_cfg_create(service_id_t iplink, dhcp_offer_t *offer)
+{
+        errno_t rc;
         service_id_t addr_id;
         service_id_t sroute_id;
@@ -420 +420 @@
 }
 
-static int dhcp_discover_proc(dhcp_link_t *dlink)
+static errno_t dhcp_discover_proc(dhcp_link_t *dlink)
 {
         dlink->state = ds_selecting;
 
-        int rc = dhcp_send_discover(dlink);
+        errno_t rc = dhcp_send_discover(dlink);
         if (rc != EOK)
                 return EIO;
@@ -438 +438 @@
 }
 
-int dhcpsrv_link_add(service_id_t link_id)
+errno_t dhcpsrv_link_add(service_id_t link_id)
 {
         dhcp_link_t *dlink;
-        int rc;
+        errno_t rc;
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "dhcpsrv_link_add(%zu)", link_id);
@@ -498 +498 @@
 }
 
-int dhcpsrv_link_remove(service_id_t link_id)
+errno_t dhcpsrv_link_remove(service_id_t link_id)
 {
         return ENOTSUP;
 }
 
-int dhcpsrv_discover(service_id_t link_id)
+errno_t dhcpsrv_discover(service_id_t link_id)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "dhcpsrv_link_add(%zu)", link_id);
@@ -520 +520 @@
 static void dhcpsrv_recv_offer(dhcp_link_t *dlink, dhcp_offer_t *offer)
 {
-        int rc;
+        errno_t rc;
 
         if (dlink->state != ds_selecting) {
@@ -546 +546 @@
 static void dhcpsrv_recv_ack(dhcp_link_t *dlink, dhcp_offer_t *offer)
 {
-        int rc;
+        errno_t rc;
 
         if (dlink->state != ds_requesting) {
@@ -572 +572 @@
         dhcp_link_t *dlink = (dhcp_link_t *)arg;
         dhcp_offer_t offer;
-        int rc;
+        errno_t rc;
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: dhcpsrv_recv() %zu bytes",
@@ -600 +600 @@
 {
         dhcp_link_t *dlink = (dhcp_link_t *)arg;
-        int rc;
+        errno_t rc;
 
         assert(dlink->state == ds_selecting);
@@ -628 +628 @@
 {
         dhcp_link_t *dlink = (dhcp_link_t *)arg;
-        int rc;
+        errno_t rc;
 
         assert(dlink->state == ds_requesting);