Changeset a42d7d8 in mainline for uspace/lib/bithenge/script.c

Timestamp:

2012-08-19T05:28:24Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

fae4d30

Parents:

1c79996

Message:

Bithenge: add fake system call errors to test error handling

File:

• uspace/lib/bithenge/script.c (modified) (3 diffs)

uspace/lib/bithenge/script.c

@@ -731 +731 @@
                 }
                 int rc = bithenge_binary_expression(&expr, op, expr, expr2);
-                if (rc != EOK)
-                        error_errno(state, rc);
+                if (rc != EOK) {
+                        expr = NULL;
+                        error_errno(state, rc);
+                }
         }
         if (state->error != EOK) {
@@ -940 +942 @@
                 int rc = bithenge_if_transform(&switch_xform, exprs[num],
                     xforms[num], switch_xform);
-                if (rc != EOK)
-                        error_errno(state, rc);
+                if (rc != EOK) {
+                        switch_xform = NULL;
+                        error_errno(state, rc);
+                }
         }
 
@@ -1189 +1193 @@
                 if (state->error != EOK)
                         break;
-                xforms[num] = parse_transform_no_compose(state);
-                num++;
+                xforms[num++] = parse_transform_no_compose(state);
         }
         if (state->error != EOK) {
-                while (xforms && num--)
-                        bithenge_transform_dec_ref(xforms[num]);
+                while (xforms && num > 1)
+                        bithenge_transform_dec_ref(xforms[--num]);
                 free(xforms);
                 bithenge_transform_dec_ref(result);