Changeset b7fd2a0 in mainline for uspace/lib/nic/src/nic_rx_control.c

Timestamp:

2018-01-13T03:10:29Z (8 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/nic/src/nic_rx_control.c (modified) (12 diffs)

uspace/lib/nic/src/nic_rx_control.c

@@ -52 +52 @@
  * @return EINVAL       Internal error, should not happen
  */
-int nic_rxc_init(nic_rxc_t *rxc)
+errno_t nic_rxc_init(nic_rxc_t *rxc)
 {
         memset(rxc, 0, sizeof(nic_rxc_t));
-        int rc;
+        errno_t rc;
         rc = nic_addr_db_init(&rxc->blocked_sources, ETH_ADDR);
         if (rc != EOK) {
@@ -84 +84 @@
  * @param filters
  */
-int nic_rxc_clear(nic_rxc_t *rxc)
+errno_t nic_rxc_clear(nic_rxc_t *rxc)
 {
         nic_addr_db_destroy(&rxc->unicast_addrs);
@@ -103 +103 @@
  *
  */
-int nic_rxc_set_addr(nic_rxc_t *rxc, const nic_address_t *prev_addr,
+errno_t nic_rxc_set_addr(nic_rxc_t *rxc, const nic_address_t *prev_addr,
     const nic_address_t *curr_addr)
 {
         if (prev_addr != NULL) {
-                int rc = nic_addr_db_remove(&rxc->unicast_addrs,
+                errno_t rc = nic_addr_db_remove(&rxc->unicast_addrs,
                     (const uint8_t *) &prev_addr->address);
                 if (rc != EOK)
@@ -173 +173 @@
  * @return ENOMEM       If there was not enough memory
  */
-int nic_rxc_unicast_set_mode(nic_rxc_t *rxc, nic_unicast_mode_t mode,
+errno_t nic_rxc_unicast_set_mode(nic_rxc_t *rxc, nic_unicast_mode_t mode,
         const nic_address_t *address_list, size_t address_count)
 {
@@ -188 +188 @@
         size_t i;
         for (i = 0; i < address_count; ++i) {
-                int rc = nic_addr_db_insert(&rxc->unicast_addrs,
+                errno_t rc = nic_addr_db_insert(&rxc->unicast_addrs,
                         (const uint8_t *) &address_list[i].address);
                 if (rc == ENOMEM) {
@@ -237 +237 @@
  * @return ENOMEM       If there was not enough memory
  */
-int nic_rxc_multicast_set_mode(nic_rxc_t *rxc, nic_multicast_mode_t mode,
+errno_t nic_rxc_multicast_set_mode(nic_rxc_t *rxc, nic_multicast_mode_t mode,
         const nic_address_t *address_list, size_t address_count)
 {
@@ -251 +251 @@
         size_t i;
         for (i = 0; i < address_count; ++i) {
-                int rc = nic_addr_db_insert(&rxc->multicast_addrs,
+                errno_t rc = nic_addr_db_insert(&rxc->multicast_addrs,
                         (const uint8_t *)&address_list[i].address);
                 if (rc == ENOMEM) {
@@ -279 +279 @@
  * @return EOK          On success
  */
-int nic_rxc_broadcast_set_mode(nic_rxc_t *rxc, nic_broadcast_mode_t mode)
+errno_t nic_rxc_broadcast_set_mode(nic_rxc_t *rxc, nic_broadcast_mode_t mode)
 {
         rxc->broadcast_mode = mode;
@@ -320 +320 @@
  * @return ENOMEM       If there was not enough memory
  */
-int nic_rxc_blocked_sources_set(nic_rxc_t *rxc,
+errno_t nic_rxc_blocked_sources_set(nic_rxc_t *rxc,
         const nic_address_t *address_list, size_t address_count)
 {
@@ -330 +330 @@
         size_t i;
         for (i = 0; i < address_count; ++i) {
-                int rc = nic_addr_db_insert(&rxc->blocked_sources,
+                errno_t rc = nic_addr_db_insert(&rxc->blocked_sources,
                         (const uint8_t *) &address_list[i].address);
                 if (rc == ENOMEM) {
@@ -348 +348 @@
  * @return ENOENT
  */
-int nic_rxc_vlan_get_mask(const nic_rxc_t *rxc, nic_vlan_mask_t *mask)
+errno_t nic_rxc_vlan_get_mask(const nic_rxc_t *rxc, nic_vlan_mask_t *mask)
 {
         if (rxc->vlan_mask == NULL) {
@@ -366 +366 @@
  * @return ENOMEM
  */
-int nic_rxc_vlan_set_mask(nic_rxc_t *rxc, const nic_vlan_mask_t *mask)
+errno_t nic_rxc_vlan_set_mask(nic_rxc_t *rxc, const nic_vlan_mask_t *mask)
 {
         if (mask == NULL) {