Changes in kernel/generic/src/ipc/sysipc.c [fbcdeb8:4e5dabf] in mainline

File:

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

kernel/generic/src/ipc/sysipc.c

@@ -111 +111 @@
         switch (imethod) {
         case IPC_M_CONNECTION_CLONE:
-        case IPC_M_CONNECT_ME:
+        case IPC_M_CLONE_ESTABLISH:
         case IPC_M_PHONE_HUNGUP:
                 /* This message is meant only for the original recipient. */
@@ -160 +160 @@
         switch (IPC_GET_IMETHOD(call->data)) {
         case IPC_M_CONNECTION_CLONE:
-        case IPC_M_CONNECT_ME:
+        case IPC_M_CLONE_ESTABLISH:
         case IPC_M_CONNECT_TO_ME:
         case IPC_M_CONNECT_ME_TO:
@@ -225 +225 @@
                         mutex_unlock(&phone->lock);
                 }
-        } else if (IPC_GET_IMETHOD(*olddata) == IPC_M_CONNECT_ME) {
+        } else if (IPC_GET_IMETHOD(*olddata) == IPC_M_CLONE_ESTABLISH) {
                 phone_t *phone = (phone_t *) IPC_GET_ARG5(*olddata);
                 
@@ -459 +459 @@
                 break;
         }
-        case IPC_M_CONNECT_ME:
+        case IPC_M_CLONE_ESTABLISH:
                 IPC_SET_ARG5(call->data, (sysarg_t) phone);
                 break;
@@ -597 +597 @@
         if (IPC_GET_IMETHOD(call->data) == IPC_M_CONNECT_TO_ME) {
                 int phoneid = phone_alloc(TASK);
-                if (phoneid < 0) { /* Failed to allocate phone */
+                if (phoneid < 0) {  /* Failed to allocate phone */
                         IPC_SET_RETVAL(call->data, ELIMIT);
                         ipc_answer(box, call);
@@ -883 +883 @@
         
         /*
-         * Userspace is not allowed to change interface and method of system
+         * User space is not allowed to change interface and method of system
          * methods on forward, allow changing ARG1, ARG2, ARG3 and ARG4 by
-         * means of method, arg1, arg2 and arg3.
+         * means of imethod, arg1, arg2 and arg3.
          * If the interface and method is immutable, don't change anything.
          */
@@ -897 +897 @@
                         IPC_SET_ARG3(call->data, arg2);
                         
-                        if (slow) {
+                        if (slow)
                                 IPC_SET_ARG4(call->data, arg3);
-                                /*
-                                 * For system methods we deliberately don't
-                                 * overwrite ARG5.
-                                 */
-                        }
+                        
+                        /*
+                         * For system methods we deliberately don't
+                         * overwrite ARG5.
+                         */
                 } else {
                         IPC_SET_IMETHOD(call->data, imethod);