Changeset 5c925ce in mainline for uspace/app/bithenge/blob.h

Timestamp:

2012-06-07T17:00:12Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

8375d0eb

Parents:

5f679702

Message:

Bithenge: make blobs a type of node

File:

• uspace/app/bithenge/blob.h (modified) (4 diffs)

uspace/app/bithenge/blob.h

@@ -39 +39 @@
 
 #include <sys/types.h>
+#include "tree.h"
 
 /** A blob of raw binary data. */
 typedef struct {
         /** @privatesection */
-        /** Operations providing random access. */
-        const struct bithenge_random_access_blob_ops_t *ops;
+        struct bithenge_node_t base;
 } bithenge_blob_t;
 
@@ -121 +121 @@
 {
         assert(blob);
-        assert(blob->ops);
-        return blob->ops->size(blob, size);
+        assert(blob->base.blob_ops);
+        return blob->base.blob_ops->size(blob, size);
 }
 
@@ -144 +144 @@
 {
         assert(blob);
-        assert(blob->ops);
-        return blob->ops->read(blob, offset, buffer, size);
+        assert(blob->base.blob_ops);
+        return blob->base.blob_ops->read(blob, offset, buffer, size);
 }
 
-/** Destroy the blob.
- * @memberof bithenge_blob_t
- * @param blob The blob.
- * @return EOK on success or an error code from errno.h.
- */
-static inline int bithenge_blob_destroy(bithenge_blob_t *blob)
+static inline bithenge_node_t *bithenge_blob_as_node(bithenge_blob_t *blob)
 {
-        assert(blob);
-        assert(blob->ops);
-        return blob->ops->destroy(blob);
+        return &blob->base;
+}
+
+static inline bithenge_blob_t *bithenge_node_as_blob(bithenge_node_t *node)
+{
+        return (bithenge_blob_t *)node;
 }
 
@@ -166 +164 @@
     const bithenge_sequential_blob_ops_t *ops);
 
-int bithenge_new_blob_from_data(bithenge_blob_t **out, const void *data,
+int bithenge_new_blob_from_data(bithenge_node_t **out, const void *data,
     size_t len);
 
-int bithenge_new_blob_from_buffer(bithenge_blob_t **out, const void *buffer,
+int bithenge_new_blob_from_buffer(bithenge_node_t **out, const void *buffer,
     size_t len, bool needs_free);