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

Timestamp:

2012-08-19T05:28:24Z (13 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/sequence.c (modified) (3 diffs)

uspace/lib/bithenge/sequence.c

@@ -488 +488 @@
                 return rc;
         }
+
+        rc = seq_node_init(struct_as_seq(node), &struct_node_seq_ops, inner,
+            blob, self->num_subtransforms, false);
+        if (rc != EOK) {
+                bithenge_scope_dec_ref(inner);
+                free(node);
+                return rc;
+        }
+
+        bithenge_transform_inc_ref(struct_as_transform(self));
+        node->transform = self;
+        node->prefix = prefix;
+
         /* We should inc_ref(node) here, but that would make a cycle. Instead,
          * we leave it 1 too low, so that when the only remaining use of node
@@ -493 +506 @@
          * struct_node_destroy. */
         bithenge_scope_set_current_node(inner, struct_as_node(node));
-
-        rc = seq_node_init(struct_as_seq(node), &struct_node_seq_ops, inner,
-            blob, self->num_subtransforms, false);
         bithenge_scope_dec_ref(inner);
-        if (rc != EOK) {
-                free(node);
-                return rc;
-        }
-
-        bithenge_transform_inc_ref(struct_as_transform(self));
-        node->transform = self;
-        node->prefix = prefix;
+
         *out = struct_as_node(node);
 
@@ -834 +837 @@
                                 rc = seq_node_field_offset(
                                     node_as_seq(*out_node), &size, count);
-                                if (rc != EOK)
+                                if (rc == EINVAL || rc == ENOENT)
                                         break;
+                                if (rc != EOK) {
+                                        bithenge_node_dec_ref(*out_node);
+                                        return rc;
+                                }
                                 *out_size = size;
                         }