projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Throw a FieldError exception when get_value() fails
[babeltrace.git]
/
types
/
struct.c
diff --git
a/types/struct.c
b/types/struct.c
index 5da9033e7a419ee1116bc7bfcf809d421791ff7e..b9fb6799b938dad37f6788c5bb14cafda8fa571d 100644
(file)
--- a/
types/struct.c
+++ b/
types/struct.c
@@
-36,14
+36,14
@@
#endif
static
#endif
static
-struct
definition *_struct_definition_new(struct
declaration *declaration,
+struct
bt_definition *_struct_definition_new(struct bt_
declaration *declaration,
struct definition_scope *parent_scope,
GQuark field_name, int index,
const char *root_name);
static
struct definition_scope *parent_scope,
GQuark field_name, int index,
const char *root_name);
static
-void _struct_definition_free(struct definition *definition);
+void _struct_definition_free(struct
bt_
definition *definition);
-int bt_struct_rw(struct
stream_pos *ppos, struct
definition *definition)
+int bt_struct_rw(struct
bt_stream_pos *ppos, struct bt_
definition *definition)
{
struct definition_struct *struct_definition =
container_of(definition, struct definition_struct, p);
{
struct definition_struct *struct_definition =
container_of(definition, struct definition_struct, p);
@@
-51,7
+51,7
@@
int bt_struct_rw(struct stream_pos *ppos, struct definition *definition)
int ret;
for (i = 0; i < struct_definition->fields->len; i++) {
int ret;
for (i = 0; i < struct_definition->fields->len; i++) {
- struct definition *field =
+ struct
bt_
definition *field =
g_ptr_array_index(struct_definition->fields, i);
ret = generic_rw(ppos, field);
if (ret)
g_ptr_array_index(struct_definition->fields, i);
ret = generic_rw(ppos, field);
if (ret)
@@
-61,7
+61,7
@@
int bt_struct_rw(struct stream_pos *ppos, struct definition *definition)
}
static
}
static
-void _struct_declaration_free(struct declaration *declaration)
+void _struct_declaration_free(struct
bt_
declaration *declaration)
{
struct declaration_struct *struct_declaration =
container_of(declaration, struct declaration_struct, p);
{
struct declaration_struct *struct_declaration =
container_of(declaration, struct declaration_struct, p);
@@
-85,7
+85,7
@@
struct declaration_struct *
uint64_t min_align)
{
struct declaration_struct *struct_declaration;
uint64_t min_align)
{
struct declaration_struct *struct_declaration;
- struct declaration *declaration;
+ struct
bt_
declaration *declaration;
struct_declaration = g_new(struct declaration_struct, 1);
declaration = &struct_declaration->p;
struct_declaration = g_new(struct declaration_struct, 1);
declaration = &struct_declaration->p;
@@
-105,8
+105,8
@@
struct declaration_struct *
}
static
}
static
-struct definition *
- _struct_definition_new(struct declaration *declaration,
+struct
bt_
definition *
+ _struct_definition_new(struct
bt_
declaration *declaration,
struct definition_scope *parent_scope,
GQuark field_name, int index,
const char *root_name)
struct definition_scope *parent_scope,
GQuark field_name, int index,
const char *root_name)
@@
-141,8
+141,8
@@
struct definition *
struct declaration_field *declaration_field =
&g_array_index(struct_declaration->fields,
struct declaration_field, i);
struct declaration_field *declaration_field =
&g_array_index(struct_declaration->fields,
struct declaration_field, i);
- struct definition **field =
- (struct definition **) &g_ptr_array_index(_struct->fields, i);
+ struct
bt_
definition **field =
+ (struct
bt_
definition **) &g_ptr_array_index(_struct->fields, i);
*field = declaration_field->declaration->definition_new(declaration_field->declaration,
_struct->p.scope,
*field = declaration_field->declaration->definition_new(declaration_field->declaration,
_struct->p.scope,
@@
-154,7
+154,7
@@
struct definition *
error:
for (i--; i >= 0; i--) {
error:
for (i--; i >= 0; i--) {
- struct definition *field = g_ptr_array_index(_struct->fields, i);
+ struct
bt_
definition *field = g_ptr_array_index(_struct->fields, i);
bt_definition_unref(field);
}
bt_free_definition_scope(_struct->p.scope);
bt_definition_unref(field);
}
bt_free_definition_scope(_struct->p.scope);
@@
-164,7
+164,7
@@
error:
}
static
}
static
-void _struct_definition_free(struct definition *definition)
+void _struct_definition_free(struct
bt_
definition *definition)
{
struct definition_struct *_struct =
container_of(definition, struct definition_struct, p);
{
struct definition_struct *_struct =
container_of(definition, struct definition_struct, p);
@@
-172,7
+172,7
@@
void _struct_definition_free(struct definition *definition)
assert(_struct->fields->len == _struct->declaration->fields->len);
for (i = 0; i < _struct->fields->len; i++) {
assert(_struct->fields->len == _struct->declaration->fields->len);
for (i = 0; i < _struct->fields->len; i++) {
- struct definition *field = g_ptr_array_index(_struct->fields, i);
+ struct
bt_
definition *field = g_ptr_array_index(_struct->fields, i);
bt_definition_unref(field);
}
bt_free_definition_scope(_struct->p.scope);
bt_definition_unref(field);
}
bt_free_definition_scope(_struct->p.scope);
@@
-183,7
+183,7
@@
void _struct_definition_free(struct definition *definition)
void bt_struct_declaration_add_field(struct declaration_struct *struct_declaration,
const char *field_name,
void bt_struct_declaration_add_field(struct declaration_struct *struct_declaration,
const char *field_name,
- struct declaration *field_declaration)
+ struct
bt_
declaration *field_declaration)
{
struct declaration_field *field;
unsigned long index;
{
struct declaration_field *field;
unsigned long index;
@@
-241,7
+241,7
@@
struct declaration_field *
/*
* field returned only valid as long as the field structure is not appended to.
*/
/*
* field returned only valid as long as the field structure is not appended to.
*/
-struct definition *
+struct
bt_
definition *
bt_struct_definition_get_field_from_index(struct definition_struct *_struct,
int index)
{
bt_struct_definition_get_field_from_index(struct definition_struct *_struct,
int index)
{
This page took
0.02552 seconds
and
4
git commands to generate.