Changeset f9c314a5 in mainline for uspace/app/bithenge/sequence.c

Timestamp:

2012-08-07T04:06:14Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

0191bd3

Parents:

0ce0103

Message:

Bithenge: make scopes reference-counted

File:

• uspace/app/bithenge/sequence.c (modified) (8 diffs)

uspace/app/bithenge/sequence.c

@@ -50 +50 @@
         const struct seq_node_ops *ops;
         bithenge_blob_t *blob;
-        bithenge_scope_t scope;
+        bithenge_scope_t *scope;
         aoff64_t *ends;
         size_t num_ends;
@@ -114 +114 @@
                 bithenge_blob_t *subblob = bithenge_node_as_blob(subblob_node);
                 aoff64_t field_size;
-                rc = bithenge_transform_prefix_length(subxform, &self->scope,
+                rc = bithenge_transform_prefix_length(subxform, self->scope,
                     subblob, &field_size);
                 bithenge_node_dec_ref(subblob_node);
@@ -177 +177 @@
 
                 aoff64_t size;
-                rc = bithenge_transform_prefix_apply(subxform, &self->scope,
+                rc = bithenge_transform_prefix_apply(subxform, self->scope,
                     bithenge_node_as_blob(blob_node), out, &size);
                 bithenge_node_dec_ref(blob_node);
@@ -209 +209 @@
                 }
 
-                rc = bithenge_transform_apply(subxform, &self->scope,
-                    blob_node, out);
+                rc = bithenge_transform_apply(subxform, self->scope, blob_node,
+                    out);
                 bithenge_node_dec_ref(blob_node);
                 bithenge_transform_dec_ref(subxform);
@@ -235 +235 @@
 static void seq_node_destroy(seq_node_t *self)
 {
-        bithenge_scope_destroy(&self->scope);
+        bithenge_scope_dec_ref(self->scope);
         bithenge_blob_dec_ref(self->blob);
         free(self->ends);
@@ -248 +248 @@
 static bithenge_scope_t *seq_node_scope(seq_node_t *self)
 {
-        return &self->scope;
+        return self->scope;
 }
 
@@ -267 +267 @@
         self->num_ends = 0;
         self->end_on_empty = end_on_empty;
-        bithenge_scope_init(&self->scope);
-        int rc = bithenge_scope_copy(&self->scope, scope);
+        int rc = bithenge_scope_new(&self->scope);
         if (rc != EOK) {
-                bithenge_scope_destroy(&self->scope);
+                free(self->ends);
+                return rc;
+        }
+        rc = bithenge_scope_copy(self->scope, scope);
+        if (rc != EOK) {
+                bithenge_scope_dec_ref(self->scope);
+                free(self->ends);
                 return rc;
         }
@@ -936 +941 @@
                 }
 
-                bithenge_scope_t scope;
-                bithenge_scope_init(&scope);
-                rc = bithenge_scope_copy(&scope,
+                bithenge_scope_t *scope;
+                rc = bithenge_scope_new(&scope);
+                if (rc != EOK) {
+                        bithenge_node_dec_ref(subxform_result);
+                        return rc;
+                }
+                rc = bithenge_scope_copy(scope,
                     seq_node_scope(do_while_as_seq(self)));
-                bithenge_scope_set_current_node(&scope, subxform_result);
+                bithenge_scope_set_current_node(scope, subxform_result);
                 if (rc != EOK) {
-                        bithenge_scope_destroy(&scope);
+                        bithenge_scope_dec_ref(scope);
                         return rc;
                 }
                 bithenge_node_t *expr_result;
-                rc = bithenge_expression_evaluate(self->expr, &scope,
+                rc = bithenge_expression_evaluate(self->expr, scope,
                     &expr_result);
-                bithenge_scope_destroy(&scope);
+                bithenge_scope_dec_ref(scope);
                 if (rc != EOK)
                         return rc;