Changeset 87b52c9 in mainline for uspace/lib/c/generic

Timestamp:

2011-04-01T11:34:41Z (15 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

66a54cc

Parents:

df3ad97 (diff), 27bdfa5 (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 from usb/development

Location:

uspace/lib/c/generic

Files:

• net/packet.c (modified) (1 diff)
• net/socket_client.c (modified) (1 diff)
• vfs/vfs.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);
 }
 

uspace/lib/c/generic/vfs/vfs.c

@@ -756 +756 @@
 {
         struct stat stat;
-        int rc;
-
-        rc = fstat(fildes, &stat);
-
+        
+        int rc = fstat(fildes, &stat);
+        if (rc != 0)
+                return rc;
+        
         if (!stat.device)
                 return -1;