Changeset 7eaeec1 in mainline for uspace/lib/block/block.c

Timestamp:

2012-08-20T21:27:38Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

6a97f2e

Parents:

f3a37e28 (diff), dd13349 (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/block/block.c (moved) (moved from uspace/lib/block/libblock.c ) (3 diffs)

uspace/lib/block/block.c

@@ -37 +37 @@
  */
 
-#include "libblock.h"
 #include "../../srv/vfs/vfs.h"
 #include <ipc/loc.h>
@@ -56 +55 @@
 #include <sys/typefmt.h>
 #include <stacktrace.h>
+#include "block.h"
 
 /** Lock protecting the device connection list */
@@ -839 +839 @@
         memcpy(data, buffer + offset, bytes);
         free(buffer);
-
+        
         return EOK;
 }