Changeset c47e1a8 in mainline for uspace/srv/clip/clip.c

Timestamp:

2010-05-21T07:50:04Z (15 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

d51ee2b

Parents:

cf8cc36 (diff), 15b592b (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 (rev. 451)

File:

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

uspace/srv/clip/clip.c

@@ -65 +65 @@
                 break;
         case CLIPBOARD_TAG_DATA:
-                rc = async_data_receive(&data, 0, 0, 0, &size);
+                rc = async_data_write_accept((void **) &data, false, 0, 0, 0, &size);
                 if (rc != EOK) {
                         ipc_answer_0(rid, rc);
@@ -145 +145 @@
         
         fibril_mutex_unlock(&clip_mtx);
-        ipc_answer_2(rid, EOK, (ipcarg_t) size, (ipcarg_t) clip_tag);
+        ipc_answer_2(rid, EOK, (ipcarg_t) size, (ipcarg_t) tag);
 }