Changeset d5070ef in mainline

Timestamp:

2012-06-22T05:32:30Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

da0fef6

Parents:

8b36bf2

Message:

Bithenge: transforms and uint32le_transform

Location:

uspace/app/bithenge

Files:

• Makefile (modified) (1 diff)
• blob.c (modified) (1 diff)
• blob.h (modified) (1 diff)
• transform.c (added)
• transform.h (added)
• tree.c (modified) (2 diffs)
• tree.h (modified) (1 diff)

uspace/app/bithenge/Makefile

@@ -38 +38 @@
         print.c \
         test.c \
+        transform.c \
         tree.c
 

uspace/app/bithenge/blob.c

@@ -297 +297 @@
 }
 
+/** Check whether the contents of two blobs are equal.
+ * @memberof bithenge_blob_t
+ * @param a, b Blobs to compare.
+ * @return Whether the blobs are equal. If an error occurs, returns false.
+ */
+bool bithenge_blob_equal(bithenge_blob_t *a, bithenge_blob_t *b)
+{
+        assert(a);
+        assert(a->base.blob_ops);
+        assert(b);
+        assert(b->base.blob_ops);
+        int rc;
+        char buffer_a[4096], buffer_b[4096];
+        aoff64_t offset = 0, size_a = sizeof(buffer_a), size_b = sizeof(buffer_b);
+        do {
+                rc = bithenge_blob_read(a, offset, buffer_a, &size_a);
+                if (rc != EOK)
+                        return false;
+                rc = bithenge_blob_read(b, offset, buffer_b, &size_b);
+                if (rc != EOK)
+                        return false;
+                if (size_a != size_b || bcmp(buffer_a, buffer_b, size_a))
+                        return false;
+                offset += size_a;
+        } while (size_a == sizeof(buffer_a));
+        return true;
+}
+
 /** @}
  */

uspace/app/bithenge/blob.h

@@ -182 +182 @@
     size_t len, bool needs_free);
 
+bool bithenge_blob_equal(bithenge_blob_t *a, bithenge_blob_t *b);
+
 #endif
 

uspace/app/bithenge/tree.c

@@ -37 +37 @@
 #include <errno.h>
 #include <stdlib.h>
+#include <str.h>
 #include "blob.h"
 #include "tree.h"
@@ -207 +208 @@
 }
 
+/** Check whether the contents of two nodes are equal. Does not yet work for
+ * internal nodes.
+ * @memberof bithenge_node_t
+ * @param a, b Nodes to compare.
+ * @return Whether the nodes are equal. If an error occurs, returns false.
+ * @todo Add support for internal nodes.
+ */
+bool bithenge_node_equal(bithenge_node_t *a, bithenge_node_t *b)
+{
+        if (a->type != b->type)
+                return false;
+        switch (a->type) {
+        case BITHENGE_NODE_INTERNAL:
+                return false;
+        case BITHENGE_NODE_BOOLEAN:
+                return a->boolean_value == b->boolean_value;
+        case BITHENGE_NODE_INTEGER:
+                return a->integer_value == b->integer_value;
+        case BITHENGE_NODE_STRING:
+                return !str_cmp(a->string_value.ptr, b->string_value.ptr);
+        case BITHENGE_NODE_BLOB:
+                return bithenge_blob_equal(bithenge_node_as_blob(a),
+                    bithenge_node_as_blob(b));
+        }
+        return false;
+}
+
 /** @}
  */

uspace/app/bithenge/tree.h

@@ -153 +153 @@
 int bithenge_new_string_node(bithenge_node_t **, const char *, bool);
 int bithenge_node_destroy(bithenge_node_t *);
+bool bithenge_node_equal(bithenge_node_t *, bithenge_node_t *);
 
 #endif