Changeset 1923501 in mainline

Timestamp:

2012-05-25T04:15:57Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

ce683ed3

Parents:

743ce51

Message:

Bithenge: use separate functions instead of casts.

Location:

uspace/app/bithenge

Files:

• blob.c (modified) (4 diffs)
• block.c (modified) (4 diffs)

uspace/app/bithenge/blob.c

@@ -84 +84 @@
 }
 
+static inline bithenge_sequential_blob_t *sequential_from_blob(
+    bithenge_blob_t *base)
+{
+        return (bithenge_sequential_blob_t *)base;
+}
+
+static inline bithenge_blob_t *blob_from_sequential(
+    bithenge_sequential_blob_t *blob)
+{
+        return &blob->base;
+}
+
 static int sequential_size(bithenge_blob_t *base, aoff64_t *size)
 {
-        bithenge_sequential_blob_t *blob = (bithenge_sequential_blob_t *)base;
+        bithenge_sequential_blob_t *blob = sequential_from_blob(base);
         int rc;
         if (blob->ops->size) {
@@ -108 +120 @@
     char *buffer, aoff64_t *size)
 {
-        bithenge_sequential_blob_t *blob = (bithenge_sequential_blob_t *)base;
+        bithenge_sequential_blob_t *blob = sequential_from_blob(base);
         aoff64_t end = offset + *size;
         if (end > blob->data_size) {
@@ -124 +136 @@
 static int sequential_destroy(bithenge_blob_t *base)
 {
-        bithenge_sequential_blob_t *blob = (bithenge_sequential_blob_t *)base;
+        bithenge_sequential_blob_t *blob = sequential_from_blob(base);
         free(blob->buffer);
         return blob->ops->destroy(blob);
@@ -151 +163 @@
         // ops->size is optional
 
-        int rc = bithenge_new_random_access_blob(&blob->base, &sequential_ops);
+        int rc = bithenge_new_random_access_blob(blob_from_sequential(blob),
+            &sequential_ops);
         if (rc != EOK)
                 return rc;

uspace/app/bithenge/block.c

@@ -51 +51 @@
 } block_blob_t;
 
+static inline block_blob_t *block_from_blob(bithenge_blob_t *base)
+{
+        return (block_blob_t *)base;
+}
+
+static inline bithenge_blob_t *blob_from_block(block_blob_t *blob)
+{
+        return &blob->base;
+}
+
 static int block_size(bithenge_blob_t *base, aoff64_t *size)
 {
-        block_blob_t *blob = (block_blob_t *)base;
+        block_blob_t *blob = block_from_blob(base);
         *size = blob->size;
         return EOK;
@@ -61 +71 @@
     aoff64_t *size)
 {
-        block_blob_t *blob = (block_blob_t *)base;
+        block_blob_t *blob = block_from_blob(base);
         if (offset > blob->size)
                 return ELIMIT;
@@ -70 +80 @@
 static int block_destroy(bithenge_blob_t *base)
 {
-        block_blob_t *blob = (block_blob_t *)base;
+        block_blob_t *blob = block_from_blob(base);
         block_fini(blob->service_id);
         free(blob);
@@ -113 +123 @@
         if (!blob)
                 return ENOMEM;
-        rc = bithenge_new_random_access_blob(&blob->base, &block_ops);
+        rc = bithenge_new_random_access_blob(blob_from_block(blob),
+            &block_ops);
         if (rc != EOK) {
                 free(blob);