Changeset 32eb01b in mainline for uspace/app/bithenge/transform.c

Timestamp:

2012-07-28T04:19:00Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

f85ca3f

Parents:

4056ad0

Message:

Bithenge: allow defining transforms with parameters

File:

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

uspace/app/bithenge/transform.c

@@ -385 +385 @@
         bithenge_node_t base;
         struct struct_transform *transform;
-        bithenge_scope_t *scope;
+        bithenge_scope_t scope;
         bithenge_blob_t *blob;
 } struct_node_t;
@@ -491 +491 @@
         for (size_t i = 0; subxforms[i].transform; i++) {
                 rc = struct_node_for_one(subxforms[i].name,
-                    subxforms[i].transform, struct_node->scope, &blob, func,
+                    subxforms[i].transform, &struct_node->scope, &blob, func,
                     data);
                 if (rc != EOK)
@@ -516 +516 @@
         bithenge_transform_dec_ref(struct_as_transform(node->transform));
         bithenge_blob_dec_ref(node->blob);
+        bithenge_scope_destroy(&node->scope);
         free(node);
 }
@@ -533 +534 @@
         if (!node)
                 return ENOMEM;
-        int rc = bithenge_init_internal_node(struct_as_node(node),
+        bithenge_scope_init(&node->scope);
+        int rc = bithenge_scope_copy(&node->scope, scope);
+        if (rc != EOK) {
+                free(node);
+                return rc;
+        }
+        rc = bithenge_init_internal_node(struct_as_node(node),
             &struct_node_ops);
         if (rc != EOK) {
+                bithenge_scope_destroy(&node->scope);
                 free(node);
                 return rc;
@@ -542 +550 @@
         node->transform = self;
         bithenge_node_inc_ref(in);
-        node->scope = scope;
         node->blob = bithenge_node_as_blob(in);
         *out = struct_as_node(node);