Changes in kernel/generic/src/ipc/sysipc.c [c9fff17:20c7c40] in mainline

File:

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

kernel/generic/src/ipc/sysipc.c

@@ -58 +58 @@
 #define DATA_XFER_LIMIT         (64 * 1024)
 
-/** Get phone from the current task by ID.
- *
- * @param phoneid       Phone ID.
- * @param phone         Place to store pointer to phone.
- * @return              EOK on success, EINVAL if ID is invalid.
- */
-static int phone_get(unative_t phoneid, phone_t **phone)
-{
-        if (phoneid >= IPC_MAX_PHONES)
-                return EINVAL;
-
-        *phone = &TASK->phones[phoneid];
-        return EOK;
+#define GET_CHECK_PHONE(phone, phoneid, err) \
+{ \
+        if (phoneid > IPC_MAX_PHONES) { \
+                err \
+        } \
+        phone = &TASK->phones[phoneid]; \
 }
 
@@ -381 +374 @@
         case IPC_M_CONNECTION_CLONE: {
                 phone_t *cloned_phone;
-
-                if (phone_get(IPC_GET_ARG1(call->data), &cloned_phone) != EOK)
-                        return ENOENT;
+                GET_CHECK_PHONE(cloned_phone, IPC_GET_ARG1(call->data),
+                    return ENOENT;);
                 phones_lock(cloned_phone, phone);
-
                 if ((cloned_phone->state != IPC_PHONE_CONNECTED) ||
                     phone->state != IPC_PHONE_CONNECTED) {
@@ -543 +534 @@
         int res;
         int rc;
-
-        if (phone_get(phoneid, &phone) != EOK)
-                return ENOENT;
+        
+        GET_CHECK_PHONE(phone, phoneid, return ENOENT;);
 
         call = ipc_call_alloc(0);
@@ -601 +591 @@
         int rc;
 
-        if (phone_get(phoneid, &phone) != EOK)
-                return ENOENT;
+        GET_CHECK_PHONE(phone, phoneid, return ENOENT;);
 
         call = ipc_call_alloc(0);
@@ -677 +666 @@
                 return IPC_CALLRET_TEMPORARY;
 
-        if (phone_get(phoneid, &phone) != EOK)
-                return IPC_CALLRET_FATAL;
+        GET_CHECK_PHONE(phone, phoneid, return IPC_CALLRET_FATAL;);
 
         call = ipc_call_alloc(0);
@@ -717 +705 @@
                 return IPC_CALLRET_TEMPORARY;
 
-        if (phone_get(phoneid, &phone) != EOK)
-                return IPC_CALLRET_FATAL;
+        GET_CHECK_PHONE(phone, phoneid, return IPC_CALLRET_FATAL;);
 
         call = ipc_call_alloc(0);
@@ -768 +755 @@
         call->flags |= IPC_CALL_FORWARDED;
 
-        if (phone_get(phoneid, &phone) != EOK) {
+        GET_CHECK_PHONE(phone, phoneid, {
                 IPC_SET_RETVAL(call->data, EFORWARD);
                 ipc_answer(&TASK->answerbox, call);
                 return ENOENT;
-        }
+        });
 
         if (!method_is_forwardable(IPC_GET_METHOD(call->data))) {
@@ -969 +956 @@
  * @return              Return 0 on success or an error code.
  */
-unative_t sys_ipc_hangup(unative_t phoneid)
+unative_t sys_ipc_hangup(int phoneid)
 {
         phone_t *phone;
 
-        if (phone_get(phoneid, &phone) != EOK)
-                return ENOENT;
+        GET_CHECK_PHONE(phone, phoneid, return ENOENT;);
 
         if (ipc_phone_hangup(phone))