Changeset 97c7682 in mainline for uspace/srv/clipboard/clipboard.c

Timestamp:

2012-07-14T11:18:40Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

804d9b6

Parents:

0747468 (diff), f0348c8 (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.

Text conflict in boot/arch/arm32/Makefile.inc:

Trivial conflict around ifeq condition.

Text conflict in kernel/arch/arm32/include/mm/page.h:

Added defines and set_pt_levelx_present function.
COnflict looked horrible because of the armv4/v7 split.

File:

• uspace/srv/clipboard/clipboard.c (moved) (moved from uspace/srv/clip/clip.c ) (2 diffs)

uspace/srv/clipboard/clipboard.c

@@ -37 +37 @@
 #include <errno.h>
 
-#define NAME  "clip"
+#define NAME  "clipboard"
 
 static char *clip_data = NULL;
@@ -181 +181 @@
         
         async_set_client_connection(clip_connection);
-        
-        if (service_register(SERVICE_CLIPBOARD) != EOK)
-                return -1;
+        int rc = service_register(SERVICE_CLIPBOARD);
+        if (rc != EOK)
+                return rc;
         
         printf("%s: Accepting connections\n", NAME);