Changeset 5cde90f in mainline for uspace/lib/libc/generic/clipboard.c

Timestamp:

2010-02-19T17:16:46Z (14 years ago)

Author:

Pavel Rimsky <pavel@…>

Branches:

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

Children:

617652f

Parents:

b86d436 (diff), f41aa81 (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:

Synchronizing with head (which has just been synchronized with this branch).

File:

• uspace/lib/libc/generic/clipboard.c (modified) (3 diffs)

uspace/lib/libc/generic/clipboard.c

@@ -84 +84 @@
                 clip_connect();
                 
-                aid_t req = async_send_1(clip_phone, CLIPBOARD_PUT_DATA, CLIPBOARD_TAG_BLOB, NULL);
+                aid_t req = async_send_1(clip_phone, CLIPBOARD_PUT_DATA, CLIPBOARD_TAG_DATA, NULL);
                 ipcarg_t rc = async_data_write_start(clip_phone, (void *) str, size);
                 if (rc != EOK) {
@@ -139 +139 @@
                         *str = sbuf;
                         return EOK;
-                case CLIPBOARD_TAG_BLOB:
+                case CLIPBOARD_TAG_DATA:
                         sbuf = malloc(size + 1);
                         if (sbuf == NULL)
@@ -148 +148 @@
                         aid_t req = async_send_1(clip_phone, CLIPBOARD_GET_DATA, tag, NULL);
                         rc = async_data_read_start(clip_phone, (void *) sbuf, size);
-                        if (rc == EOVERFLOW) {
+                        if ((int) rc == EOVERFLOW) {
                                 /*
                                  * The data in the clipboard has changed since