Changeset a46e56b in mainline for uspace/srv/clipboard/clipboard.c

Timestamp:

2018-03-22T06:49:35Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

77f0a1d

Parents:

3e242d2

git-author:

Jakub Jermar <jakub@…> (2018-03-21 23:29:06)

git-committer:

Jakub Jermar <jakub@…> (2018-03-22 06:49:35)

Message:

Prefer handle over ID in naming handle variables

File:

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

uspace/srv/clipboard/clipboard.c

@@ -95 +95 @@
         fibril_mutex_lock(&clip_mtx);
 
-        cap_call_handle_t callid;
+        cap_call_handle_t chandle;
         size_t size;
 
@@ -101 +101 @@
         switch (IPC_GET_ARG1(*request)) {
         case CLIPBOARD_TAG_DATA:
-                if (!async_data_read_receive(&callid, &size)) {
-                        async_answer_0(callid, EINVAL);
+                if (!async_data_read_receive(&chandle, &size)) {
+                        async_answer_0(chandle, EINVAL);
                         async_answer_0(rid, EINVAL);
                         break;
@@ -109 +109 @@
                 if (clip_tag != CLIPBOARD_TAG_DATA) {
                         /* So far we only understand binary data */
-                        async_answer_0(callid, EOVERFLOW);
+                        async_answer_0(chandle, EOVERFLOW);
                         async_answer_0(rid, EOVERFLOW);
                         break;
@@ -116 +116 @@
                 if (clip_size != size) {
                         /* The client expects different size of data */
-                        async_answer_0(callid, EOVERFLOW);
+                        async_answer_0(chandle, EOVERFLOW);
                         async_answer_0(rid, EOVERFLOW);
                         break;
                 }
 
-                errno_t retval = async_data_read_finalize(callid, clip_data, size);
+                errno_t retval = async_data_read_finalize(chandle, clip_data, size);
                 if (retval != EOK) {
                         async_answer_0(rid, retval);
@@ -152 +152 @@
 }
 
-static void clip_connection(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
+static void clip_connection(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg)
 {
         /* Accept connection */
-        async_answer_0(iid, EOK);
+        async_answer_0(icall_handle, EOK);
 
         while (true) {
                 ipc_call_t call;
-                cap_call_handle_t callid = async_get_call(&call);
+                cap_call_handle_t chandle = async_get_call(&call);
 
                 if (!IPC_GET_IMETHOD(call))
@@ -166 +166 @@
                 switch (IPC_GET_IMETHOD(call)) {
                 case CLIPBOARD_PUT_DATA:
-                        clip_put_data(callid, &call);
+                        clip_put_data(chandle, &call);
                         break;
                 case CLIPBOARD_GET_DATA:
-                        clip_get_data(callid, &call);
+                        clip_get_data(chandle, &call);
                         break;
                 case CLIPBOARD_CONTENT:
-                        clip_content(callid, &call);
+                        clip_content(chandle, &call);
                         break;
                 default:
-                        async_answer_0(callid, ENOENT);
+                        async_answer_0(chandle, ENOENT);
                 }
         }