Changes in uspace/lib/c/generic/clipboard.c [8d6bcc8c:cde999a] in mainline

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)