projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Build fixes.
[babeltrace.git]
/
types
/
array.c
diff --git
a/types/array.c
b/types/array.c
index 6dd3b9ca8a6c869e419ef17c54ff9141ebf8c31f..e6a6c218c9c6c4d025ba8dc115f10a95cf4f5465 100644
(file)
--- a/
types/array.c
+++ b/
types/array.c
@@
-38,8
+38,8
@@
void array_copy(struct stream_pos *dest, const struct format *fdest,
fdest->array_begin(dest, array_type);
for (i = 0; i < array_type->len; i++) {
fdest->array_begin(dest, array_type);
for (i = 0; i < array_type->len; i++) {
- struct
type *elem_type = array->current_element.type
;
- elem
_type->p.type->copy(dest, fdest, src, fsrc, elem_type
);
+ struct
declaration *elem = array->current_element.declaration
;
+ elem
->type->copy(dest, fdest, src, fsrc, elem
);
}
fsrc->array_end(src, array_type);
fdest->array_end(dest, array_type);
}
fsrc->array_end(src, array_type);
fdest->array_end(dest, array_type);
@@
-60,7
+60,6
@@
struct type_array *
{
struct type_array *array_type;
struct type *type;
{
struct type_array *array_type;
struct type *type;
- int ret;
array_type = g_new(struct type_array, 1);
type = &array_type->p;
array_type = g_new(struct type_array, 1);
type = &array_type->p;
@@
-75,18
+74,7
@@
struct type_array *
type->declaration_new = _array_declaration_new;
type->declaration_free = _array_declaration_free;
type->ref = 1;
type->declaration_new = _array_declaration_new;
type->declaration_free = _array_declaration_free;
type->ref = 1;
-
- if (type->name) {
- ret = register_type(type);
- if (ret)
- goto error_register;
- }
return array_type;
return array_type;
-
-error_register:
- type_unref(array_type->elem);
- g_free(array_type);
- return NULL;
}
static
}
static
@@
-100,24
+88,25
@@
struct declaration *
array = g_new(struct declaration_array, 1);
type_ref(&array_type->p);
array = g_new(struct declaration_array, 1);
type_ref(&array_type->p);
- array->p.type = array_type;
+ array->p.type = type;
+ array->type = array_type;
array->p.ref = 1;
array->scope = new_declaration_scope(parent_scope);
array->current_element.declaration =
array->p.ref = 1;
array->scope = new_declaration_scope(parent_scope);
array->current_element.declaration =
- array_type->elem
.p->declaration_new(&array_type->elem.p
,
-
parent_scope);
+ array_type->elem
->declaration_new(array_type->elem
,
+ parent_scope);
return &array->p;
}
static
void _array_declaration_free(struct declaration *declaration)
{
return &array->p;
}
static
void _array_declaration_free(struct declaration *declaration)
{
- struct
type
_array *array =
- container_of(declaration, struct
type
_array, p);
+ struct
declaration
_array *array =
+ container_of(declaration, struct
declaration
_array, p);
struct declaration *elem_declaration =
array->current_element.declaration;
struct declaration *elem_declaration =
array->current_element.declaration;
- elem_
type->p.type->declaration_free(elem_type
);
+ elem_
declaration->type->declaration_free(elem_declaration
);
free_declaration_scope(array->scope);
type_unref(array->p.type);
g_free(array);
free_declaration_scope(array->scope);
type_unref(array->p.type);
g_free(array);
This page took
0.023548 seconds
and
4
git commands to generate.