projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use stdout FILE * rather than /dev/stdout for default output
[babeltrace.git]
/
types
/
array.c
diff --git
a/types/array.c
b/types/array.c
index d8ddd637c69bb804e5401e8276da9ba22a69969d..f592dba1ebdf9905cf3230586aaf990d0db9556c 100644
(file)
--- a/
types/array.c
+++ b/
types/array.c
@@
-27,27
+27,24
@@
struct definition *_array_definition_new(struct declaration *declaration,
static
void _array_definition_free(struct definition *definition);
static
void _array_definition_free(struct definition *definition);
-void array_copy(struct stream_pos *dest, const struct format *fdest,
- struct stream_pos *src, const struct format *fsrc,
- struct definition *definition)
+int array_rw(struct stream_pos *pos, struct definition *definition)
{
{
- struct definition_array *array =
+ struct definition_array *array
_definition
=
container_of(definition, struct definition_array, p);
container_of(definition, struct definition_array, p);
- struct declaration_array *array_declaration = array->declaration;
+ const struct declaration_array *array_declaration =
+ array_definition->declaration;
uint64_t i;
uint64_t i;
+ int ret;
- fsrc->array_begin(src, array_declaration);
- if (fdest)
- fdest->array_begin(dest, array_declaration);
-
+ /* No need to align, because the first field will align itself. */
for (i = 0; i < array_declaration->len; i++) {
struct definition *elem =
for (i = 0; i < array_declaration->len; i++) {
struct definition *elem =
- g_array_index(array->elems, struct field, i).definition;
- elem->declaration->copy(dest, fdest, src, fsrc, elem);
+ g_array_index(array_definition->elems, struct field, i).definition;
+ ret = generic_rw(pos, elem);
+ if (ret)
+ return ret;
}
}
- fsrc->array_end(src, array_declaration);
- if (fdest)
- fdest->array_end(dest, array_declaration);
+ return 0;
}
static
}
static
@@
-78,7
+75,6
@@
struct declaration_array *
declaration->id = CTF_TYPE_ARRAY;
/* No need to align the array, the first element will align itself */
declaration->alignment = 1;
declaration->id = CTF_TYPE_ARRAY;
/* No need to align the array, the first element will align itself */
declaration->alignment = 1;
- declaration->copy = array_copy;
declaration->declaration_free = _array_declaration_free;
declaration->definition_new = _array_definition_new;
declaration->definition_free = _array_definition_free;
declaration->declaration_free = _array_declaration_free;
declaration->definition_new = _array_definition_new;
declaration->definition_free = _array_definition_free;
@@
-145,6
+141,11
@@
void _array_definition_free(struct definition *definition)
g_free(array);
}
g_free(array);
}
+uint64_t array_len(struct definition_array *array)
+{
+ return array->elems->len;
+}
+
struct definition *array_index(struct definition_array *array, uint64_t i)
{
if (i >= array->elems->len)
struct definition *array_index(struct definition_array *array, uint64_t i)
{
if (i >= array->elems->len)
This page took
0.022961 seconds
and
4
git commands to generate.