Changeset 5c925ce in mainline for uspace/app/bithenge/tree.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/tree.h (modified) (7 diffs)

uspace/app/bithenge/tree.h

@@ -57 +57 @@
         BITHENGE_NODE_INTEGER,
         BITHENGE_NODE_STRING,
-        // TODO: BITHENGE_NODE_BLOB,
+        BITHENGE_NODE_BLOB,
 } bithenge_node_type_t;
 
@@ -63 +63 @@
         bithenge_node_type_t type;
         union {
-                struct bithenge_internal_node_ops_t *internal_ops;
+                const struct bithenge_internal_node_ops_t *internal_ops;
                 bool boolean_value;
                 bithenge_int_t integer_value;
@@ -70 +70 @@
                         bool needs_free;
                 } string_value;
+                const struct bithenge_random_access_blob_ops_t *blob_ops;
         };
 } bithenge_node_t;
@@ -82 +83 @@
 typedef struct bithenge_internal_node_ops_t {
         int (*for_each)(bithenge_node_t *node, bithenge_for_each_func_t func, void *data);
+        int (*destroy)(bithenge_node_t *node);
 } bithenge_internal_node_ops_t;
 
 static inline int bithenge_node_for_each(bithenge_node_t *node, bithenge_for_each_func_t func, void *data)
 {
+        assert(node->type == BITHENGE_NODE_INTERNAL);
         return node->internal_ops->for_each(node, func, data);
 }
@@ -91 +94 @@
 static inline bool bithenge_boolean_node_value(bithenge_node_t *node)
 {
+        assert(node->type == BITHENGE_NODE_BOOLEAN);
         return node->boolean_value;
 }
@@ -96 +100 @@
 static inline bithenge_int_t bithenge_integer_node_value(bithenge_node_t *node)
 {
+        assert(node->type == BITHENGE_NODE_INTEGER);
         return node->integer_value;
 }
@@ -101 +106 @@
 static inline const char *bithenge_string_node_value(bithenge_node_t *node)
 {
+        assert(node->type == BITHENGE_NODE_STRING);
         return node->string_value.ptr;
 }