Changeset 1761268 in mainline

Timestamp:

2011-12-17T13:22:25Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

65d7b0a, 7aaed09, f044e96

Parents:

8708be3

Message:

cstyle (no change in functionality)

Files:

• kernel/generic/src/ipc/sysipc.c (modified) (1 diff)
• uspace/srv/net/net/packet_server.c (modified) (2 diffs)

kernel/generic/src/ipc/sysipc.c

@@ -278 +278 @@
                 }
         } else if (IPC_GET_IMETHOD(*olddata) == IPC_M_SHARE_IN) {
-                if (!IPC_GET_RETVAL(answer->data)) { 
+                if (!IPC_GET_RETVAL(answer->data)) {
                         irq_spinlock_lock(&answer->sender->lock, true);
                         as_t *as = answer->sender->as;

uspace/srv/net/net/packet_server.c

@@ -304 +304 @@
 static int packet_reply(packet_t *packet)
 {
+        if (!packet_is_valid(packet))
+                return EINVAL;
+        
         ipc_callid_t callid;
         size_t size;
-
-        if (!packet_is_valid(packet))
-                return EINVAL;
-
         if (!async_share_in_receive(&callid, &size)) {
                 async_answer_0(callid, EINVAL);
                 return EINVAL;
         }
-
+        
         if (size != packet->length) {
                 async_answer_0(callid, ENOMEM);
@@ -375 +374 @@
         case NET_PACKET_GET:
                 packet = pm_find(IPC_GET_ID(*call));
-                if (!packet_is_valid(packet)) {
+                if (!packet_is_valid(packet))
                         return ENOENT;
-                }
+                
                 return packet_reply(packet);