Changeset 3090715 in mainline for uspace/lib/net/generic/packet_remote.c

Timestamp:

2010-11-07T21:16:56Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

1d0d06a

Parents:

9ce7eb5 (diff), 9ee9d5d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jakub/helenos/net/.

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