Changeset fb4d788 in mainline for kernel/generic/src/ipc/sysipc.c

Timestamp:

2015-07-28T11:28:14Z (9 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

6accc5cf

Parents:

df2bce3 (diff), 47726b5e (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 the mainline

File:

• kernel/generic/src/ipc/sysipc.c (modified) (2 diffs)

kernel/generic/src/ipc/sysipc.c

@@ -388 +388 @@
 {
         call_t *call = get_call(callid);
-        phone_t *phone;
-        bool need_old = answer_need_old(call);
-        bool after_forward = false;
-        ipc_data_t old;
-        int rc;
-
         if (!call)
                 return ENOENT;
-
+        
+        ipc_data_t old;
+        bool need_old = answer_need_old(call);
         if (need_old)
                 old = call->data;
+        
+        bool after_forward = false;
+        int rc;
+        phone_t *phone;
         
         if (phone_get(phoneid, &phone) != EOK) {
@@ -409 +409 @@
                 goto error;
         }
-
+        
         call->flags |= IPC_CALL_FORWARDED;