Changeset 0773396 in mainline for uspace/srv/ns/service.c

Timestamp:

2013-12-25T13:05:25Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

bc54126c

Parents:

f4a47e52 (diff), 6946f23 (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/service.c (modified) (2 diffs)

uspace/srv/ns/service.c

@@ -106 +106 @@
 {
 loop:
-        list_foreach(pending_conn, cur) {
-                pending_conn_t *pr = list_get_instance(cur, pending_conn_t, link);
-                
+        list_foreach(pending_conn, link, pending_conn_t, pr) {
                 ht_link_t *link = hash_table_find(&service_hash_table, &pr->service);
                 if (!link)
@@ -117 +115 @@
                     pr->arg3, 0, IPC_FF_NONE);
                 
-                list_remove(cur);
+                list_remove(&pr->link);
                 free(pr);
                 goto loop;