Changes in uspace/lib/net/generic/packet_remote.c [0ab68f6:b69ceea] in mainline

File:

• uspace/lib/net/generic/packet_remote.c (modified) (7 diffs)

uspace/lib/net/generic/packet_remote.c

@@ -38 +38 @@
 #include <async.h>
 #include <errno.h>
+#include <err.h>
 #include <ipc/ipc.h>
 #include <ipc/packet.h>
@@ -66 +67 @@
 packet_return(int phone, packet_ref packet, packet_id_t packet_id, size_t size)
 {
+        ERROR_DECLARE;
+        
         ipc_call_t answer;
-        aid_t message;
-        int rc;
-        
-        message = async_send_1(phone, NET_PACKET_GET, packet_id, &answer);
+        aid_t message = async_send_1(phone, NET_PACKET_GET, packet_id, &answer);
 
         *packet = (packet_t) as_get_mappable_page(size);
-        rc = async_share_in_start_0_0(phone, *packet, size);
-        if (rc != EOK) {
+        if (ERROR_OCCURRED(async_share_in_start_0_0(phone, *packet, size)) ||
+            ERROR_OCCURRED(pm_add(*packet))) {
                 munmap(*packet, size);
                 async_wait_for(message, NULL);
-                return rc;
-        }
-        rc = pm_add(*packet);
-        if (rc != EOK) {
-                munmap(*packet, size);
-                async_wait_for(message, NULL);
-                return rc;
+                return ERROR_CODE;
         }
         
@@ -109 +103 @@
 int packet_translate_remote(int phone, packet_ref packet, packet_id_t packet_id)
 {
-        int rc;
+        ERROR_DECLARE;
         
         if (!packet)
@@ -118 +112 @@
                 ipcarg_t size;
                 
-                rc = async_req_1_1(phone, NET_PACKET_GET_SIZE, packet_id,
-                    &size);
-                if (rc != EOK)
-                        return rc;
-                rc = packet_return(phone, packet, packet_id, size);
-                if (rc != EOK)
-                        return rc;
+                ERROR_PROPAGATE(async_req_1_1(phone, NET_PACKET_GET_SIZE,
+                    packet_id, &size));
+                ERROR_PROPAGATE(packet_return(phone, packet, packet_id, size));
         }
         if ((*packet)->next) {
@@ -151 +141 @@
     size_t max_prefix, size_t max_suffix)
 {
+        ERROR_DECLARE;
+        
         ipcarg_t packet_id;
         ipcarg_t size;
-        int rc;
-        
-        rc = async_req_4_2(phone, NET_PACKET_CREATE_4, max_content, addr_len,
-            max_prefix, max_suffix, &packet_id, &size);
-        if (rc != EOK)
+        
+        if (ERROR_OCCURRED(async_req_4_2(phone, NET_PACKET_CREATE_4,
+            max_content, addr_len, max_prefix, max_suffix, &packet_id, &size)))
                 return NULL;
         
@@ -163 +153 @@
         packet_t packet = pm_find(packet_id);
         if (!packet) {
-                rc = packet_return(phone, &packet, packet_id, size);
-                if (rc != EOK)
+                if (ERROR_OCCURRED(packet_return(phone, &packet, packet_id,
+                    size)))
                         return NULL;
         }
@@ -182 +172 @@
 packet_t packet_get_1_remote(int phone, size_t content)
 {
+        ERROR_DECLARE;
+        
         ipcarg_t packet_id;
         ipcarg_t size;
-        int rc;
-        
-        rc = async_req_1_2(phone, NET_PACKET_CREATE_1, content, &packet_id,
-            &size);
-        if (rc != EOK)
+        
+        if (ERROR_OCCURRED(async_req_1_2(phone, NET_PACKET_CREATE_1, content,
+            &packet_id, &size)))
                 return NULL;
         
         packet_t packet = pm_find(packet_id);
         if (!packet) {
-                rc = packet_return(phone, &packet, packet_id, size);
-                if (rc != EOK)
+                if (ERROR_OCCURRED(packet_return(phone, &packet, packet_id,
+                    size)))
                         return NULL;
         }