Changeset d011038 in mainline for uspace/lib/net/tl/socket_core.c

Timestamp:

2011-03-29T20:12:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8f17503

Parents:

c4fb95d3 (diff), 93ebe4e (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/net/tl/socket_core.c (modified) (3 diffs)

uspace/lib/net/tl/socket_core.c

@@ -107 +107 @@
                 socket_release(socket);
 
-        socket_cores_exclude(local_sockets, socket->socket_id);
+        socket_cores_exclude(local_sockets, socket->socket_id, free);
 }
 
@@ -230 +230 @@
 
 fail:
-        socket_port_map_destroy(&socket_port->map);
+        socket_port_map_destroy(&socket_port->map, free);
         free(socket_port);
         return rc;
@@ -649 +649 @@
                         if (socket_port->count <= 0) {
                                 // destroy the map
-                                socket_port_map_destroy(&socket_port->map);
+                                socket_port_map_destroy(&socket_port->map, free);
                                 // release the port
                                 socket_ports_exclude(global_sockets,
-                                    socket->port);
+                                    socket->port, free);
                         } else {
                                 // remove
                                 socket_port_map_exclude(&socket_port->map,
-                                    socket->key, socket->key_length);
+                                    socket->key, socket->key_length, free);
                         }
                 }