Changeset 1affcdf3 in mainline for uspace/srv/clip/clip.c

Timestamp:

2011-06-10T19:33:41Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

1878386

Parents:

13ecdac9 (diff), 79a141a (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

File:

• uspace/srv/clip/clip.c (modified) (4 diffs)

uspace/srv/clip/clip.c

@@ -30 +30 @@
 #include <bool.h>
 #include <async.h>
-#include <ipc/ns.h>
+#include <ns.h>
 #include <ipc/services.h>
 #include <ipc/clipboard.h>
@@ -153 +153 @@
         async_answer_0(iid, EOK);
         
-        bool cont = true;
-        while (cont) {
+        while (true) {
                 ipc_call_t call;
                 ipc_callid_t callid = async_get_call(&call);
                 
+                if (!IPC_GET_IMETHOD(call))
+                        break;
+                
                 switch (IPC_GET_IMETHOD(call)) {
-                case IPC_M_PHONE_HUNGUP:
-                        cont = false;
-                        continue;
                 case CLIPBOARD_PUT_DATA:
                         clip_put_data(callid, &call);
@@ -179 +178 @@
 int main(int argc, char *argv[])
 {
-        printf(NAME ": HelenOS clipboard service\n");
+        printf("%s: HelenOS clipboard service\n", NAME);
         
         async_set_client_connection(clip_connection);
@@ -186 +185 @@
                 return -1;
         
-        printf(NAME ": Accepting connections\n");
+        printf("%s: Accepting connections\n", NAME);
+        task_retval(0);
         async_manager();