Changeset 3317724 in mainline for uspace/srv/net/tl/udp/udp.c

Timestamp:

2011-03-29T19:32:53Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

eea1dd5

Parents:

2cf95e8 (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/srv/net/tl/udp/udp.c (modified) (3 diffs)

uspace/srv/net/tl/udp/udp.c

@@ -417 +417 @@
         rc = packet_dimensions_initialize(&udp_globals.dimensions);
         if (rc != EOK) {
-                socket_ports_destroy(&udp_globals.sockets);
+                socket_ports_destroy(&udp_globals.sockets, free);
                 fibril_rwlock_write_unlock(&udp_globals.lock);
                 return rc;
@@ -434 +434 @@
             &data);
         if (rc != EOK) {
-                socket_ports_destroy(&udp_globals.sockets);
+                socket_ports_destroy(&udp_globals.sockets, free);
                 fibril_rwlock_write_unlock(&udp_globals.lock);
                 return rc;
@@ -740 +740 @@
         int socket_id;
         size_t addrlen;
-        size_t size;
+        size_t size = 0;
         ipc_call_t answer;
         size_t answer_count;