Changeset 04a7435f in mainline for uspace/app/bithenge/test.c

Timestamp:

2012-06-26T19:56:26Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

978ccaf1

Parents:

f2da0bb

Message:

Bithenge: add the struct transform

File:

• uspace/app/bithenge/test.c (modified) (2 diffs)

uspace/app/bithenge/test.c

@@ -69 +69 @@
                 bithenge_node_dec_ref(node);
         } else {
-                bithenge_transform_t *transform;
+                bithenge_transform_t *transform = NULL;
+                bithenge_node_t *node = NULL, *node2 = NULL;
                 rc = bithenge_parse_script(argv[1], &transform);
                 if (rc != EOK) {
                         printf("Error parsing script: %s\n", str_error(rc));
-                        return 1;
+                        goto error;
                 }
 
-                bithenge_node_t *node, *node2;
                 int rc = bithenge_node_from_source(&node, argv[2]);
                 if (rc != EOK) {
                         printf("Error creating node from source: %s\n", str_error(rc));
-                        return 1;
+                        goto error;
                 }
 
@@ -86 +86 @@
                 if (rc != EOK) {
                         printf("Error applying transform: %s\n", str_error(rc));
-                        return 1;
+                        goto error;
                 }
 
                 bithenge_node_dec_ref(node);
+                node = NULL;
                 bithenge_transform_dec_ref(transform);
+                transform = NULL;
 
                 rc = bithenge_print_node(BITHENGE_PRINT_PYTHON, node2);
                 if (rc != EOK) {
                         printf("Error printing node: %s\n", str_error(rc));
-                        return 1;
+                        goto error;
                 }
                 bithenge_node_dec_ref(node2);
+                node2 = NULL;
                 printf("\n");
+
+                return 0;
+
+error:
+                bithenge_node_dec_ref(node);
+                bithenge_node_dec_ref(node2);
+                bithenge_transform_dec_ref(transform);
+                return 1;
         }