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

Timestamp:

2012-08-07T04:06:14Z (13 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/expression.c (modified) (2 diffs)

uspace/app/bithenge/expression.c

@@ -424 +424 @@
 {
         param_wrapper_t *self = transform_as_param_wrapper(base);
-        bithenge_scope_t inner;
-        bithenge_scope_init(&inner);
-        int rc = param_wrapper_fill_scope(self, &inner, outer);
-        if (rc != EOK)
-                goto error;
-
-        rc = bithenge_transform_apply(self->transform, &inner, in, out);
+        bithenge_scope_t *inner;
+        int rc = bithenge_scope_new(&inner);
+        if (rc != EOK)
+                return rc;
+        rc = param_wrapper_fill_scope(self, inner, outer);
+        if (rc != EOK)
+                goto error;
+
+        rc = bithenge_transform_apply(self->transform, inner, in, out);
         in = NULL;
 
 error:
-        bithenge_scope_destroy(&inner);
+        bithenge_scope_dec_ref(inner);
         return rc;
 }
@@ -442 +444 @@
 {
         param_wrapper_t *self = transform_as_param_wrapper(base);
-        bithenge_scope_t inner;
-        bithenge_scope_init(&inner);
-        int rc = param_wrapper_fill_scope(self, &inner, outer);
-        if (rc != EOK)
-                goto error;
-
-        rc = bithenge_transform_prefix_length(self->transform, &inner, in,
-            out);
+        bithenge_scope_t *inner;
+        int rc = bithenge_scope_new(&inner);
+        if (rc != EOK)
+                return rc;
+        rc = param_wrapper_fill_scope(self, inner, outer);
+        if (rc != EOK)
+                goto error;
+
+        rc = bithenge_transform_prefix_length(self->transform, inner, in, out);
         in = NULL;
 
 error:
-        bithenge_scope_destroy(&inner);
+        bithenge_scope_dec_ref(inner);
         return rc;
 }