Changeset 132ab5d1 in mainline for uspace/srv/clipboard/clipboard.c

Timestamp:

2018-01-30T03:20:45Z (8 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/srv/clipboard/clipboard.c (modified) (4 diffs)

uspace/srv/clipboard/clipboard.c

@@ -29 +29 @@
 #include <async.h>
 #include <errno.h>
+#include <str_error.h>
 #include <fibril_synch.h>
 #include <ipc/services.h>
 #include <ipc/clipboard.h>
 #include <loc.h>
-#include <malloc.h>
 #include <stdio.h>
 #include <stdbool.h>
+#include <stdlib.h>
 #include <task.h>
 
@@ -120 +121 @@
                 }
                 
-                sysarg_t retval = async_data_read_finalize(callid, clip_data, size);
+                int retval = async_data_read_finalize(callid, clip_data, size);
                 if (retval != EOK) {
                         async_answer_0(rid, retval);
@@ -188 +189 @@
         rc = loc_server_register(NAME);
         if (rc != EOK) {
-                printf("%s: Failed registering server. (%d)\n", NAME, rc);
+                printf("%s: Failed registering server: %s\n", NAME, str_error(rc));
                 return rc;
         }
@@ -194 +195 @@
         rc = loc_service_register(SERVICE_NAME_CLIPBOARD, &svc_id);
         if (rc != EOK) {
-                printf("%s: Failed registering service. (%d)\n", NAME, rc);
+                printf("%s: Failed registering service : %s\n", NAME, str_error(rc));
                 return rc;
         }