Changeset 5c5c346a in mainline

Timestamp:

2012-05-31T04:01:28Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

50985c34

Parents:

4b16422

Message:

Bithenge: file blobs

Location:

uspace/app/bithenge

Files:

• Makefile (modified) (1 diff)
• block.c (modified) (1 diff)
• file.c (added)
• file.h (added)
• test.c (modified) (2 diffs)

uspace/app/bithenge/Makefile

@@ -35 +35 @@
         blob.c \
         block.c \
+        file.c \
         test.c
 

uspace/app/bithenge/block.c

@@ -112 +112 @@
         aoff64_t size;
         rc = block_get_bsize(service_id, &bsize);
-        if (rc != EOK)
+        if (rc != EOK) {
+                block_fini(service_id);
                 return rc;
+        }
         rc = block_get_nblocks(service_id, &nblocks);
-        if (rc != EOK)
+        if (rc != EOK) {
+                block_fini(service_id);
                 return rc;
+        }
         size = bsize * nblocks;
 
         // Create blob
         block_blob_t *blob = malloc(sizeof(*blob));
-        if (!blob)
+        if (!blob) {
+                block_fini(service_id);
                 return ENOMEM;
+        }
         rc = bithenge_new_random_access_blob(blob_from_block(blob),
             &block_ops);
         if (rc != EOK) {
                 free(blob);
+                block_fini(service_id);
                 return rc;
         }

uspace/app/bithenge/test.c

@@ -40 +40 @@
 #include "blob.h"
 #include "block.h"
+#include "file.h"
 
 static void
@@ -83 +84 @@
         bithenge_blob_destroy(blob);
 
+        bithenge_new_file_blob(&blob, "/textdemo");
+        printf("Data from file:/textdemo: ");
+        print_blob(blob);
+        bithenge_blob_destroy(blob);
+
         return 0;
 }