Changeset 132ab5d1 in mainline for uspace/lib/c/generic/clipboard.c

Timestamp:

2018-01-30T03:20:45Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (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 commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

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

uspace/lib/c/generic/clipboard.c

@@ -45 +45 @@
 #include <ipc/services.h>
 #include <loc.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <str.h>
 
@@ -95 +95 @@
  * @param str String to put to clipboard or NULL.
  *
- * @return Zero on success or negative error code.
+ * @return Zero on success or an error code.
  *
  */
@@ -104 +104 @@
         if (size == 0) {
                 async_exch_t *exch = clip_exchange_begin();
-                sysarg_t rc = async_req_1_0(exch, CLIPBOARD_PUT_DATA,
+                int rc = async_req_1_0(exch, CLIPBOARD_PUT_DATA,
                     CLIPBOARD_TAG_NONE);
                 clip_exchange_end(exch);
@@ -113 +113 @@
                 aid_t req = async_send_1(exch, CLIPBOARD_PUT_DATA, CLIPBOARD_TAG_DATA,
                     NULL);
-                sysarg_t rc = async_data_write_start(exch, (void *) str, size);
+                int rc = async_data_write_start(exch, (void *) str, size);
                 clip_exchange_end(exch);
                 
                 if (rc != EOK) {
-                        sysarg_t rc_orig;
+                        int rc_orig;
                         async_wait_for(req, &rc_orig);
                         if (rc_orig == EOK)
@@ -137 +137 @@
  * @param str Here pointer to the newly allocated string is stored.
  *
- * @return Zero on success or negative error code.
+ * @return Zero on success or an error code.
  *
  */
@@ -148 +148 @@
                 sysarg_t size;
                 sysarg_t tag;
-                sysarg_t rc = async_req_0_2(exch, CLIPBOARD_CONTENT, &size, &tag);
+                int rc = async_req_0_2(exch, CLIPBOARD_CONTENT, &size, &tag);
                 
                 clip_exchange_end(exch);
@@ -185 +185 @@
                         
                         if (rc != EOK) {
-                                sysarg_t rc_orig;
+                                int rc_orig;
                                 async_wait_for(req, &rc_orig);
                                 if (rc_orig == EOK)