Changes in kernel/generic/src/ipc/sysipc.c [2541646:466e95f7] in mainline

File:

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

kernel/generic/src/ipc/sysipc.c

@@ -161 +161 @@
 {
         int rc = EOK;
-        sysipc_ops_t *ops;
 
         spinlock_lock(&answer->forget_lock);
@@ -170 +169 @@
                 spinlock_unlock(&answer->forget_lock);
 
-                ops = sysipc_ops_get(answer->request_method);
-                if (ops->answer_cleanup)
-                        ops->answer_cleanup(answer, olddata);
-
+                SYSIPC_OP(answer_cleanup, answer, olddata);
                 return rc;
         } else {
@@ -213 +209 @@
                 return rc;
 
-        ops = sysipc_ops_get(answer->request_method);
-        if (ops->answer_preprocess)
-                rc = ops->answer_preprocess(answer, olddata);
-        
-        return rc;
+        return SYSIPC_OP(answer_preprocess, answer, olddata);
 }
 
@@ -230 +222 @@
 static int request_preprocess(call_t *call, phone_t *phone)
 {
-        int rc = EOK;
-
         call->request_method = IPC_GET_IMETHOD(call->data);
-
-        sysipc_ops_t *ops = sysipc_ops_get(call->request_method);
-        if (ops->request_preprocess)
-                rc = ops->request_preprocess(call, phone);
-        
-        return rc;
+        return SYSIPC_OP(request_preprocess, call, phone);
 }
 
@@ -256 +241 @@
                 IPC_SET_RETVAL(call->data, EFORWARD);
         
-        sysipc_ops_t *ops = sysipc_ops_get(call->request_method);
-        if (ops->answer_process)
-                (void) ops->answer_process(call);
+        SYSIPC_OP(answer_process, call);
 }
 
@@ -273 +256 @@
 static int process_request(answerbox_t *box, call_t *call)
 {
-        int rc = EOK;
-
-        sysipc_ops_t *ops = sysipc_ops_get(call->request_method);
-        if (ops->request_process)
-                rc = ops->request_process(call, box);
-        
-        return rc;
+        return SYSIPC_OP(request_process, call, box);
 }