Changes in uspace/app/nic/nic.c [1d6dd2a:18902ca6] in mainline

File:

• uspace/app/nic/nic.c (modified) (15 diffs)

uspace/app/nic/nic.c

@@ -40 +40 @@
 #include <stdlib.h>
 #include <stddef.h>
-#include <str.h>
 #include <str_error.h>
 
@@ -73 +72 @@
 static async_sess_t *get_nic_by_index(size_t i)
 {
-        errno_t rc;
+        int rc;
         size_t count;
         char *svc_name;
@@ -111 +110 @@
 }
 
-static errno_t nic_get_info(service_id_t svc_id, char *svc_name,
+static int nic_get_info(service_id_t svc_id, char *svc_name,
     nic_info_t *info)
 {
         async_sess_t *sess;
         nic_role_t role;
-        errno_t rc;
+        int rc;
 
         sess = loc_service_connect(svc_id, INTERFACE_DDF, 0);
@@ -246 +245 @@
 }
 
-static errno_t nic_list(void)
+static int nic_list(void)
 {
         category_id_t nic_cat;
@@ -254 +253 @@
         char *svc_name;
         char *addr_str;
-        errno_t rc;
+        int rc;
 
         rc = loc_category_get_id("nic", &nic_cat, 0);
@@ -317 +316 @@
 }
 
-static errno_t nic_set_speed(int i, char *str)
+static int nic_set_speed(int i, char *str)
 {
         async_sess_t *sess;
@@ -324 +323 @@
         nic_channel_mode_t oldduplex;
         nic_role_t oldrole;
-        errno_t rc;
+        int rc;
 
         rc = str_uint32_t(str, NULL, 10, false, &speed);
@@ -352 +351 @@
 }
 
-static errno_t nic_set_duplex(int i, char *str)
+static int nic_set_duplex(int i, char *str)
 {
         async_sess_t *sess;
@@ -359 +358 @@
         nic_channel_mode_t oldduplex;
         nic_role_t oldrole;
-        errno_t rc;
+        int rc;
 
         if (!str_cmp(str, "half"))
@@ -390 +389 @@
 }
 
-static errno_t nic_set_autoneg(int i)
-{
-        async_sess_t *sess;
-        errno_t rc;
+static int nic_set_autoneg(int i)
+{
+        async_sess_t *sess;
+        int rc;
 
         sess = get_nic_by_index(i);
@@ -410 +409 @@
 }
 
-static errno_t nic_set_addr(int i, char *str)
+static int nic_set_addr(int i, char *str)
 {
         async_sess_t *sess;
         nic_address_t addr;
-        errno_t rc;
-        int idx;
+        int rc, idx;
 
         sess = get_nic_by_index(i);
@@ -439 +437 @@
 }
 
-static errno_t nic_set_rx_unicast(int i, char *str)
+static int nic_set_rx_unicast(int i, char *str)
 {
         async_sess_t *sess;
@@ -474 +472 @@
 }
 
-static errno_t nic_set_rx_multicast(int i, char *str)
+static int nic_set_rx_multicast(int i, char *str)
 {
         async_sess_t *sess;
@@ -503 +501 @@
 }
 
-static errno_t nic_set_rx_broadcast(int i, char *str)
+static int nic_set_rx_broadcast(int i, char *str)
 {
         async_sess_t *sess;
@@ -529 +527 @@
 int main(int argc, char *argv[])
 {
-        errno_t rc;
+        int rc;
         uint32_t index;