Changeset 30c4005 in mainline for uspace/srv/ns

Timestamp:

2011-04-29T19:56:07Z (15 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

2874547

Parents:

6b40ea7 (diff), afdcc60e (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 improvements

Location:

uspace/srv/ns

Files:

• clonable.c (modified) (1 diff)
• service.c (modified) (1 diff)
• task.c (modified) (1 diff)

uspace/srv/ns/clonable.c

@@ -78 +78 @@
         if (list_empty(&cs_req)) {
                 /* There was no pending connection request. */
-                printf(NAME ": Unexpected clonable server.\n");
+                printf("%s: Unexpected clonable server.\n", NAME);
                 ipc_answer_0(callid, EBUSY);
                 return;

uspace/srv/ns/service.c

@@ -35 +35 @@
 #include <assert.h>
 #include <errno.h>
+#include <stdio.h>
+#include <malloc.h>
 #include "service.h"
 #include "ns.h"

uspace/srv/ns/task.c

@@ -39 +39 @@
 #include <stdio.h>
 #include <macros.h>
+#include <malloc.h>
 #include "task.h"
 #include "ns.h"