Changeset 77f0a1d in mainline for uspace/srv/clipboard/clipboard.c

Timestamp:

2018-03-22T22:54:52Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

eed4139

Parents:

a46e56b

Message:

Get rid of rid in favor of req_handle

File:

• uspace/srv/clipboard/clipboard.c (modified) (10 diffs)

uspace/srv/clipboard/clipboard.c

@@ -47 +47 @@
 static service_id_t svc_id;
 
-static void clip_put_data(cap_call_handle_t rid, ipc_call_t *request)
+static void clip_put_data(cap_call_handle_t req_handle, ipc_call_t *request)
 {
         char *data;
@@ -65 +65 @@
 
                 fibril_mutex_unlock(&clip_mtx);
-                async_answer_0(rid, EOK);
+                async_answer_0(req_handle, EOK);
                 break;
         case CLIPBOARD_TAG_DATA:
                 rc = async_data_write_accept((void **) &data, false, 0, 0, 0, &size);
                 if (rc != EOK) {
-                        async_answer_0(rid, rc);
+                        async_answer_0(req_handle, rc);
                         break;
                 }
@@ -84 +84 @@
 
                 fibril_mutex_unlock(&clip_mtx);
-                async_answer_0(rid, EOK);
+                async_answer_0(req_handle, EOK);
                 break;
         default:
-                async_answer_0(rid, EINVAL);
-        }
-}
-
-static void clip_get_data(cap_call_handle_t rid, ipc_call_t *request)
+                async_answer_0(req_handle, EINVAL);
+        }
+}
+
+static void clip_get_data(cap_call_handle_t req_handle, ipc_call_t *request)
 {
         fibril_mutex_lock(&clip_mtx);
@@ -103 +103 @@
                 if (!async_data_read_receive(&chandle, &size)) {
                         async_answer_0(chandle, EINVAL);
-                        async_answer_0(rid, EINVAL);
+                        async_answer_0(req_handle, EINVAL);
                         break;
                 }
@@ -110 +110 @@
                         /* So far we only understand binary data */
                         async_answer_0(chandle, EOVERFLOW);
-                        async_answer_0(rid, EOVERFLOW);
+                        async_answer_0(req_handle, EOVERFLOW);
                         break;
                 }
@@ -117 +117 @@
                         /* The client expects different size of data */
                         async_answer_0(chandle, EOVERFLOW);
-                        async_answer_0(rid, EOVERFLOW);
+                        async_answer_0(req_handle, EOVERFLOW);
                         break;
                 }
@@ -123 +123 @@
                 errno_t retval = async_data_read_finalize(chandle, clip_data, size);
                 if (retval != EOK) {
-                        async_answer_0(rid, retval);
-                        break;
-                }
-
-                async_answer_0(rid, EOK);
+                        async_answer_0(req_handle, retval);
+                        break;
+                }
+
+                async_answer_0(req_handle, EOK);
                 break;
         default:
@@ -134 +134 @@
                  * data from the clipbard
                  */
-                async_answer_0(rid, EINVAL);
+                async_answer_0(req_handle, EINVAL);
                 break;
         }
@@ -141 +141 @@
 }
 
-static void clip_content(cap_call_handle_t rid, ipc_call_t *request)
+static void clip_content(cap_call_handle_t req_handle, ipc_call_t *request)
 {
         fibril_mutex_lock(&clip_mtx);
@@ -149 +149 @@
 
         fibril_mutex_unlock(&clip_mtx);
-        async_answer_2(rid, EOK, (sysarg_t) size, (sysarg_t) tag);
-}
-
-static void clip_connection(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg)
+        async_answer_2(req_handle, EOK, (sysarg_t) size, (sysarg_t) tag);
+}
+
+static void clip_connection(cap_call_handle_t icall_handle, ipc_call_t *icall,
+    void *arg)
 {
         /* Accept connection */