Changeset b910455 in mainline for uspace/lib/c/generic/net/socket_client.c

Timestamp:

2011-04-07T09:46:11Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6639ae1

Parents:

f6bffee (diff), 8e80d3f (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/lib/c/generic/net/socket_client.c (modified) (1 diff)

uspace/lib/c/generic/net/socket_client.c

@@ -749 +749 @@
         dyn_fifo_destroy(&socket->received);
         dyn_fifo_destroy(&socket->accepted);
-        sockets_exclude(socket_get_sockets(), socket->socket_id);
+        sockets_exclude(socket_get_sockets(), socket->socket_id, free);
 }