Changes in uspace/lib/net/netif/netif_local.c [0ab68f6:42a9f27] in mainline

File:

• uspace/lib/net/netif/netif_local.c (modified) (15 diffs)

uspace/lib/net/netif/netif_local.c

@@ -43 +43 @@
 #include <ipc/services.h>
 #include <ipc/netif.h>
-#include <errno.h>
+#include <err.h>
 
 #include <generic.h>
@@ -113 +113 @@
 int netif_start_req_local(int netif_phone, device_id_t device_id)
 {
-        int rc;
+        ERROR_DECLARE;
         
         fibril_rwlock_write_lock(&netif_globals.lock);
         
         netif_device_t *device;
-        rc = find_device(device_id, &device);
-        if (rc != EOK) {
+        if (ERROR_OCCURRED(find_device(device_id, &device))) {
                 fibril_rwlock_write_unlock(&netif_globals.lock);
-                return rc;
+                return ERROR_CODE;
         }
         
@@ -149 +148 @@
 int netif_stop_req_local(int netif_phone, device_id_t device_id)
 {
-        int rc;
+        ERROR_DECLARE;
         
         fibril_rwlock_write_lock(&netif_globals.lock);
         
         netif_device_t *device;
-        rc = find_device(device_id, &device);
-        if (rc != EOK) {
+        if (ERROR_OCCURRED(find_device(device_id, &device))) {
                 fibril_rwlock_write_unlock(&netif_globals.lock);
-                return rc;
+                return ERROR_CODE;
         }
         
@@ -205 +203 @@
     measured_string_ref *address, char **data)
 {
-        int rc;
+        ERROR_DECLARE;
         
         if (!address || !data)
@@ -213 +211 @@
         
         measured_string_t translation;
-        rc = netif_get_addr_message(device_id, &translation);
-        if (rc == EOK) {
+        if (!ERROR_OCCURRED(netif_get_addr_message(device_id, &translation))) {
                 *address = measured_string_copy(&translation);
-                rc = (*address) ? EOK : ENOMEM;
+                ERROR_CODE = (*address) ? EOK : ENOMEM;
         }
         
@@ -223 +220 @@
         *data = (**address).value;
         
-        return rc;
+        return ERROR_CODE;
 }
 
@@ -267 +264 @@
 int netif_init_module(async_client_conn_t client_connection)
 {
-        int rc;
+        ERROR_DECLARE;
         
         async_set_client_connection(client_connection);
@@ -274 +271 @@
         netif_device_map_initialize(&netif_globals.device_map);
         
-        rc = pm_init();
-        if (rc != EOK)
-                return rc;
+        ERROR_PROPAGATE(pm_init());
         
         fibril_rwlock_initialize(&netif_globals.lock);
-        
-        rc = netif_initialize();
-        if (rc != EOK) {
+        if (ERROR_OCCURRED(netif_initialize())) {
                 pm_destroy();
-                return rc;
+                return ERROR_CODE;
         }
         
@@ -324 +317 @@
 static int register_message(const char *name, device_id_t device_id, int phone)
 {
+        ERROR_DECLARE;
+        
         netif_device_t *device;
-        int rc;
-        
-        rc = find_device(device_id, &device);
-        if (rc != EOK)
-                return rc;
-        
-        if (device->nil_phone > 0)
+        ERROR_PROPAGATE(find_device(device_id, &device));
+        if(device->nil_phone > 0)
                 return ELIMIT;
         
@@ -359 +349 @@
     ipc_call_t *call, ipc_call_t *answer, int *answer_count)
 {
+        ERROR_DECLARE;
+        
         size_t length;
         device_stats_t stats;
         packet_t packet;
         measured_string_t address;
-        int rc;
         
         *answer_count = 0;
@@ -376 +367 @@
         case IPC_M_CONNECT_TO_ME:
                 fibril_rwlock_write_lock(&netif_globals.lock);
-                rc = register_message(name, IPC_GET_DEVICE(call),
+                ERROR_CODE = register_message(name, IPC_GET_DEVICE(call),
                     IPC_GET_PHONE(call));
                 fibril_rwlock_write_unlock(&netif_globals.lock);
-                return rc;
+                return ERROR_CODE;
                 
         case NET_NETIF_SEND:
-                rc = packet_translate_remote(netif_globals.net_phone, &packet,
-                    IPC_GET_PACKET(call));
-                if (rc != EOK)
-                        return rc;
+                ERROR_PROPAGATE(packet_translate_remote(netif_globals.net_phone,
+                    &packet, IPC_GET_PACKET(call)));
                 return netif_send_msg_local(0, IPC_GET_DEVICE(call), packet,
                     IPC_GET_SENDER(call));
-                
+                    
         case NET_NETIF_START:
                 return netif_start_req_local(0, IPC_GET_DEVICE(call));
@@ -395 +384 @@
                 fibril_rwlock_read_lock(&netif_globals.lock);
 
-                rc = async_data_read_receive(&callid, &length);
-                if (rc != EOK) {
+                if (ERROR_OCCURRED(async_data_read_receive(&callid, &length))) {
                         fibril_rwlock_read_unlock(&netif_globals.lock);
-                        return rc;
+                        return ERROR_CODE;
                 }
                 if (length < sizeof(device_stats_t)) {
@@ -405 +393 @@
                 }
 
-                rc = netif_get_device_stats(IPC_GET_DEVICE(call), &stats);
-                if (rc == EOK) {
-                        rc = async_data_read_finalize(callid, &stats,
+                if (ERROR_NONE(netif_get_device_stats(IPC_GET_DEVICE(call),
+                    &stats))) {
+                        ERROR_CODE = async_data_read_finalize(callid, &stats,
                             sizeof(device_stats_t));
                 }
 
                 fibril_rwlock_read_unlock(&netif_globals.lock);
-                return rc;
+                return ERROR_CODE;
 
         case NET_NETIF_STOP:
@@ -419 +407 @@
         case NET_NETIF_GET_ADDR:
                 fibril_rwlock_read_lock(&netif_globals.lock);
-                rc = netif_get_addr_message(IPC_GET_DEVICE(call), &address);
-                if (rc == EOK)
-                        rc = measured_strings_reply(&address, 1);
+                if (ERROR_NONE(netif_get_addr_message(IPC_GET_DEVICE(call),
+                    &address)))
+                        ERROR_CODE = measured_strings_reply(&address, 1);
                 fibril_rwlock_read_unlock(&netif_globals.lock);
-                return rc;
+                return ERROR_CODE;
         }
         
@@ -443 +431 @@
 int netif_module_start_standalone(async_client_conn_t client_connection)
 {
-        int rc;
-        
-        rc = netif_init_module(client_connection);
-        if (rc != EOK)
-                return rc;
+        ERROR_DECLARE;
+        
+        ERROR_PROPAGATE(netif_init_module(client_connection));
         
         async_manager();