*/
#include <babeltrace/compiler.h>
-#include <babeltrace/types.h>
+#include <babeltrace/format.h>
void array_copy(struct stream_pos *dest, const struct format *fdest,
struct stream_pos *src, const struct format *fsrc,
for (i = 0; i < array_class->len; i++) {
struct type_class *elem_class = array_class->elem;
- elem_class->copy(dest, fdest, src, fsrc, &elem_class->p);
+ elem_class->copy(dest, fdest, src, fsrc, elem_class);
}
fsrc->array_end(src, array_class);
fdest->array_end(dest, array_class);
void array_type_free(struct type_class_array *array_class)
{
- array_class->elem->free(&array_class->elem->p);
+ type_unref(array_class->elem);
g_free(array_class);
}
static void _array_type_free(struct type_class *type_class)
{
- struct type_class_struct *array_class =
+ struct type_class_array *array_class =
container_of(type_class, struct type_class_array, p);
array_type_free(array_class);
}
struct type_class *elem)
{
struct type_class_array *array_class;
+ struct type_class *type_class;
int ret;
array_class = g_new(struct type_class_array, 1);
- type_class = &float_class->p;
+ type_class = &array_class->p;
array_class->len = len;
+ type_ref(elem);
+ array_class->elem = elem;
type_class->name = g_quark_from_string(name);
/* No need to align the array, the first element will align itself */
type_class->alignment = 1;
type_class->copy = array_copy;
type_class->free = _array_type_free;
+ type_class->ref = 1;
if (type_class->name) {
ret = ctf_register_type(type_class);
return array_class;
error_register:
- array_class->elem->free(&array_class->elem->p);
+ type_unref(array_class->elem);
g_free(array_class);
return NULL;
}