Changeset f9c314a5 in mainline for uspace/app/bithenge/test.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/test.c (modified) (3 diffs)

uspace/app/bithenge/test.c

@@ -69 +69 @@
                 bithenge_node_dec_ref(node);
         } else {
-                bithenge_scope_t scope;
+                bithenge_scope_t *scope = NULL;
                 bithenge_transform_t *transform = NULL;
                 bithenge_node_t *node = NULL, *node2 = NULL;
 
-                bithenge_scope_init(&scope);
+                rc = bithenge_scope_new(&scope);
+                if (rc != EOK) {
+                        printf("Error creating scope: %s\n", str_error(rc));
+                        scope = NULL;
+                        goto error;
+                }
 
                 rc = bithenge_parse_script(argv[1], &transform);
                 if (rc != EOK) {
                         printf("Error parsing script: %s\n", str_error(rc));
+                        transform = NULL;
                         goto error;
                 }
 
-                int rc = bithenge_node_from_source(&node, argv[2]);
+                rc = bithenge_node_from_source(&node, argv[2]);
                 if (rc != EOK) {
                         printf("Error creating node from source: %s\n", str_error(rc));
+                        node = NULL;
                         goto error;
                 }
 
-                rc = bithenge_transform_apply(transform, &scope, node, &node2);
+                rc = bithenge_transform_apply(transform, scope, node, &node2);
                 if (rc != EOK) {
                         printf("Error applying transform: %s\n", str_error(rc));
+                        node2 = NULL;
                         goto error;
                 }
@@ -105 +113 @@
                 bithenge_node_dec_ref(node2);
                 node2 = NULL;
+                bithenge_scope_dec_ref(scope);
+                scope = NULL;
                 printf("\n");
 
@@ -113 +123 @@
                 bithenge_node_dec_ref(node2);
                 bithenge_transform_dec_ref(transform);
-                bithenge_scope_destroy(&scope);
+                bithenge_scope_dec_ref(scope);
                 return 1;
         }