Changeset 022d72ff in mainline

Timestamp:

2015-06-03T19:22:33Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

09024119

Parents:

eab9689

Message:

Improve code structure.

File:

• kernel/generic/src/ipc/ops/conctmeto.c (modified) (1 diff)

kernel/generic/src/ipc/ops/conctmeto.c

@@ -74 +74 @@
 static int answer_process(call_t *answer)
 {
-        if (IPC_GET_RETVAL(answer->data) && ((int) answer->priv >= 0)) {
-                /*
-                 * Something went wrong and there is a phone that needs to be
-                 * deallocated.
-                 */
-                phone_dealloc(answer->priv);
+        int newphid = (int) answer->priv;
+
+        if (IPC_GET_RETVAL(answer->data)) {
+                if (newphid >= 0) {
+                        /*
+                         * The phone was indeed allocated and now needs
+                         * to be deallocated.
+                         */
+                        phone_dealloc(newphid);
+                }
         } else {
-                IPC_SET_ARG5(answer->data, answer->priv);
+                IPC_SET_ARG5(answer->data, newphid);
         }