Changeset 978ccaf1 in mainline for uspace/app/bithenge/helenos/block.c

Timestamp:

2012-06-27T03:35:43Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

600f5d1

Parents:

04a7435f

Message:

Bithenge: various cleanup and tweaks

File:

• uspace/app/bithenge/helenos/block.c (modified) (5 diffs)

uspace/app/bithenge/helenos/block.c

@@ -51 +51 @@
 } block_blob_t;
 
-static inline block_blob_t *block_from_blob(bithenge_blob_t *base)
+static inline block_blob_t *blob_as_block(bithenge_blob_t *base)
 {
         return (block_blob_t *)base;
 }
 
-static inline bithenge_blob_t *blob_from_block(block_blob_t *blob)
+static inline bithenge_blob_t *block_as_blob(block_blob_t *blob)
 {
         return &blob->base;
@@ -63 +63 @@
 static int block_size(bithenge_blob_t *base, aoff64_t *size)
 {
-        block_blob_t *blob = block_from_blob(base);
-        *size = blob->size;
+        block_blob_t *self = blob_as_block(base);
+        *size = self->size;
         return EOK;
 }
@@ -71 +71 @@
     aoff64_t *size)
 {
-        block_blob_t *blob = block_from_blob(base);
-        if (offset > blob->size)
+        block_blob_t *self = blob_as_block(base);
+        if (offset > self->size)
                 return ELIMIT;
-        *size = min(*size, blob->size - offset);
-        return block_read_bytes_direct(blob->service_id, offset, *size, buffer);
+        *size = min(*size, self->size - offset);
+        return block_read_bytes_direct(self->service_id, offset, *size, buffer);
 }
 
-static int block_destroy(bithenge_blob_t *base)
+static void block_destroy(bithenge_blob_t *base)
 {
-        block_blob_t *blob = block_from_blob(base);
-        block_fini(blob->service_id);
-        free(blob);
-        return EOK;
+        block_blob_t *self = blob_as_block(base);
+        block_fini(self->service_id);
+        free(self);
 }
 
@@ -129 +128 @@
                 return ENOMEM;
         }
-        rc = bithenge_new_random_access_blob(blob_from_block(blob),
+        rc = bithenge_init_random_access_blob(block_as_blob(blob),
             &block_ops);
         if (rc != EOK) {
@@ -138 +137 @@
         blob->service_id = service_id;
         blob->size = size;
-        *out = bithenge_blob_as_node(blob_from_block(blob));
+        *out = bithenge_blob_as_node(block_as_blob(blob));
 
         return EOK;