Changeset 8ff0bd2 in mainline for uspace/srv/ns/clonable.c

Timestamp:

2011-09-04T11:30:58Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

03bc76a

Parents:

d2c67e7 (diff), deac215e (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/ns/clonable.c (modified) (3 diffs)

uspace/srv/ns/clonable.c

@@ -52 +52 @@
 
 /** List of clonable-service connection requests. */
-static link_t cs_req;
+static list_t cs_req;
 
 int clonable_init(void)
@@ -76 +76 @@
     ipc_callid_t callid)
 {
-        if (list_empty(&cs_req)) {
+        link_t *req_link;
+
+        req_link = list_first(&cs_req);
+        if (req_link == NULL) {
                 /* There was no pending connection request. */
                 printf("%s: Unexpected clonable server.\n", NAME);
@@ -83 +86 @@
         }
         
-        cs_req_t *csr = list_get_instance(cs_req.next, cs_req_t, link);
-        list_remove(&csr->link);
+        cs_req_t *csr = list_get_instance(req_link, cs_req_t, link);
+        list_remove(req_link);
         
         /* Currently we can only handle a single type of clonable service. */