Changes in uspace/lib/net/generic/packet_remote.c [c5b59ce:14f1db0] in mainline

File:

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

uspace/lib/net/generic/packet_remote.c

@@ -38 +38 @@
 #include <async.h>
 #include <errno.h>
-#include <err.h>
 #include <ipc/ipc.h>
 #include <sys/mman.h>
 
+#include <net_err.h>
 #include <net_messages.h>
 #include <packet/packet.h>
@@ -64 +64 @@
  *
  */
-static int
-packet_return(int phone, packet_ref packet, packet_id_t packet_id, size_t size)
-{
+static int 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);
-
         *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))) {
+        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);
@@ -94 +91 @@
         
         *packet = pm_find(packet_id);
-        if (!*packet) {
+        if (!(*packet)) {
                 ipcarg_t size;
                 
-                ERROR_PROPAGATE(async_req_1_1(phone, NET_PACKET_GET_SIZE,
-                    packet_id, &size));
+                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) {
+        if ((** packet).next) {
                 packet_t next;
                 
-                return packet_translate_remote(phone, &next, (*packet)->next);
+                return packet_translate_remote(phone, &next, (** packet).next);
         }
         
@@ -118 +114 @@
         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)))
+        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;
         
@@ -125 +121 @@
         packet_t packet = pm_find(packet_id);
         if (!packet) {
-                if (ERROR_OCCURRED(packet_return(phone, &packet, packet_id,
-                    size)))
+                if (ERROR_OCCURRED(packet_return(phone, &packet, packet_id, size)))
                         return NULL;
         }
@@ -146 +141 @@
         packet_t packet = pm_find(packet_id);
         if (!packet) {
-                if (ERROR_OCCURRED(packet_return(phone, &packet, packet_id,
-                    size)))
+                if (ERROR_OCCURRED(packet_return(phone, &packet, packet_id, size)))
                         return NULL;
         }