Changeset 19f24fd in mainline for uspace/srv/clip/clip.c

Timestamp:

2010-02-05T22:25:52Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

dafa2d04

Parents:

83349b03 (diff), d42976c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/srv/clip/clip.c (modified) (4 diffs)

uspace/srv/clip/clip.c

@@ -64 +64 @@
                 ipc_answer_0(rid, EOK);
                 break;
-        case CLIPBOARD_TAG_BLOB:
-                rc = async_data_blob_receive(&data, 0, &size);
+        case CLIPBOARD_TAG_DATA:
+                rc = async_data_write_accept((void **) &data, false, 0, 0, 0, &size);
                 if (rc != EOK) {
                         ipc_answer_0(rid, rc);
@@ -78 +78 @@
                 clip_data = data;
                 clip_size = size;
-                clip_tag = CLIPBOARD_TAG_BLOB;
+                clip_tag = CLIPBOARD_TAG_DATA;
                 
                 fibril_mutex_unlock(&clip_mtx);
@@ -97 +97 @@
         /* Check for clipboard data tag compatibility */
         switch (IPC_GET_ARG1(*request)) {
-        case CLIPBOARD_TAG_BLOB:
+        case CLIPBOARD_TAG_DATA:
                 if (!async_data_read_receive(&callid, &size)) {
                         ipc_answer_0(callid, EINVAL);
@@ -104 +104 @@
                 }
                 
-                if (clip_tag != CLIPBOARD_TAG_BLOB) {
-                        /* So far we only understand BLOB */
+                if (clip_tag != CLIPBOARD_TAG_DATA) {
+                        /* So far we only understand binary data */
                         ipc_answer_0(callid, EOVERFLOW);
                         ipc_answer_0(rid, EOVERFLOW);