Merge branch 'master' into bindings/python
authorMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Fri, 29 Nov 2013 06:19:33 +0000 (07:19 +0100)
committerMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Fri, 29 Nov 2013 06:19:33 +0000 (07:19 +0100)
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
1  2 
formats/ctf/types/array.c
formats/ctf/types/float.c
formats/ctf/writer/event-fields.c
lib/iterator.c

index 04801d4f05455df71160f85b4cd0ed6d58c9d180,b1e8d6c5af7b316110b31920a7a61ed125ac4c98..979f7a3dc313895d29085e6de09e7ad904b675c0
@@@ -56,6 -57,9 +57,11 @@@ int ctf_array_read(struct bt_stream_po
                                g_string_insert_len(array_definition->string,
                                        0, (char *) ctf_get_pos_addr(pos),
                                        array_declaration->len);
 -                              if (!ctf_move_pos(pos, array_declaration->len * CHAR_BIT))
 -                                      return -EFAULT;
 -                              return 0;
++                              /*
++                               * We want to populate both the string
++                               * and the underlying values, so carry
++                               * on calling bt_array_rw().
++                               */
                        }
                }
        }
Simple merge
Simple merge
diff --cc lib/iterator.c
Simple merge
This page took 0.039216 seconds and 4 git commands to generate.