projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ir: rename ctf_type_id -> bt_ctf_type_id
[babeltrace.git]
/
formats
/
ctf
/
types
/
array.c
diff --git
a/formats/ctf/types/array.c
b/formats/ctf/types/array.c
index b1e8d6c5af7b316110b31920a7a61ed125ac4c98..016d527fb1b328cf81ba374521d38e7126a460ef 100644
(file)
--- a/
formats/ctf/types/array.c
+++ b/
formats/ctf/types/array.c
@@
-38,7
+38,7
@@
int ctf_array_read(struct bt_stream_pos *ppos, struct bt_definition *definition)
struct ctf_stream_pos *pos =
container_of(ppos, struct ctf_stream_pos, parent);
struct ctf_stream_pos *pos =
container_of(ppos, struct ctf_stream_pos, parent);
- if (elem->id ==
CTF_TYPE
_INTEGER) {
+ if (elem->id ==
BT_CTF_TYPE_ID
_INTEGER) {
struct declaration_integer *integer_declaration =
container_of(elem, struct declaration_integer, p);
struct declaration_integer *integer_declaration =
container_of(elem, struct declaration_integer, p);
@@
-57,9
+57,11
@@
int ctf_array_read(struct bt_stream_pos *ppos, struct bt_definition *definition)
g_string_insert_len(array_definition->string,
0, (char *) ctf_get_pos_addr(pos),
array_declaration->len);
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().
+ */
}
}
}
}
}
}
@@
-76,7
+78,7
@@
int ctf_array_write(struct bt_stream_pos *ppos, struct bt_definition *definition
struct ctf_stream_pos *pos =
container_of(ppos, struct ctf_stream_pos, parent);
struct ctf_stream_pos *pos =
container_of(ppos, struct ctf_stream_pos, parent);
- if (elem->id ==
CTF_TYPE
_INTEGER) {
+ if (elem->id ==
BT_CTF_TYPE_ID
_INTEGER) {
struct declaration_integer *integer_declaration =
container_of(elem, struct declaration_integer, p);
struct declaration_integer *integer_declaration =
container_of(elem, struct declaration_integer, p);
This page took
0.024417 seconds
and
4
git commands to generate.