Changeset 93ebe4e in mainline for uspace/lib/c/generic/net

Timestamp:

2011-03-29T19:04:41Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

3317724, 99b65d2, d011038, ebebd38

Parents:

2afc54d (diff), 5fe7692 (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 Petr Koupy's fix for ticket #273.

Location:

uspace/lib/c/generic/net

Files:

• packet.c (modified) (1 diff)
• socket_client.c (modified) (1 diff)

uspace/lib/c/generic/net/packet.c

@@ -190 +190 @@
                 }
         }
-        gpm_destroy(&pm_globals.packet_map);
+        gpm_destroy(&pm_globals.packet_map, free);
         /* leave locked */
 }

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);
 }