X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Finteger.c;h=52cc6bb682fa6baad78c2c0036b2d44eebeab5cf;hp=47f23eb5e7fb43cc3d84ecfb68daba3e15c137af;hb=a9049b491173a73f8544a16a95ab4e5375f28466;hpb=2b77e6a6ff6a0b46ee3bd607d1d75f2d20af5ea0 diff --git a/types/integer.c b/types/integer.c index 47f23eb5..52cc6bb6 100644 --- a/types/integer.c +++ b/types/integer.c @@ -33,15 +33,15 @@ #include static -struct definition *_integer_definition_new(struct declaration *declaration, +struct bt_definition *_integer_definition_new(struct bt_declaration *declaration, struct definition_scope *parent_scope, GQuark field_name, int index, const char *root_name); static -void _integer_definition_free(struct definition *definition); +void _integer_definition_free(struct bt_definition *definition); static -void _integer_declaration_free(struct declaration *declaration) +void _integer_declaration_free(struct bt_declaration *declaration) { struct declaration_integer *integer_declaration = container_of(declaration, struct declaration_integer, p); @@ -56,7 +56,7 @@ struct declaration_integer * { struct declaration_integer *integer_declaration; - integer_declaration = g_new(struct declaration_integer, 1); + integer_declaration = g_new0(struct declaration_integer, 1); integer_declaration->p.id = CTF_TYPE_INTEGER; integer_declaration->p.alignment = alignment; integer_declaration->p.declaration_free = _integer_declaration_free; @@ -73,8 +73,8 @@ struct declaration_integer * } static -struct definition * - _integer_definition_new(struct declaration *declaration, +struct bt_definition * + _integer_definition_new(struct bt_declaration *declaration, struct definition_scope *parent_scope, GQuark field_name, int index, const char *root_name) @@ -84,7 +84,7 @@ struct definition * struct definition_integer *integer; int ret; - integer = g_new(struct definition_integer, 1); + integer = g_new0(struct definition_integer, 1); bt_declaration_ref(&integer_declaration->p); integer->p.declaration = declaration; integer->declaration = integer_declaration; @@ -106,7 +106,7 @@ struct definition * } static -void _integer_definition_free(struct definition *definition) +void _integer_definition_free(struct bt_definition *definition) { struct definition_integer *integer = container_of(definition, struct definition_integer, p); @@ -115,7 +115,7 @@ void _integer_definition_free(struct definition *definition) g_free(integer); } -enum ctf_string_encoding bt_get_int_encoding(const struct definition *field) +enum ctf_string_encoding bt_get_int_encoding(const struct bt_definition *field) { struct definition_integer *integer_definition; const struct declaration_integer *integer_declaration; @@ -126,7 +126,7 @@ enum ctf_string_encoding bt_get_int_encoding(const struct definition *field) return integer_declaration->encoding; } -int bt_get_int_base(const struct definition *field) +int bt_get_int_base(const struct bt_definition *field) { struct definition_integer *integer_definition; const struct declaration_integer *integer_declaration; @@ -137,7 +137,7 @@ int bt_get_int_base(const struct definition *field) return integer_declaration->base; } -size_t bt_get_int_len(const struct definition *field) +size_t bt_get_int_len(const struct bt_definition *field) { struct definition_integer *integer_definition; const struct declaration_integer *integer_declaration; @@ -148,7 +148,7 @@ size_t bt_get_int_len(const struct definition *field) return integer_declaration->len; } -int bt_get_int_byte_order(const struct definition *field) +int bt_get_int_byte_order(const struct bt_definition *field) { struct definition_integer *integer_definition; const struct declaration_integer *integer_declaration; @@ -159,7 +159,7 @@ int bt_get_int_byte_order(const struct definition *field) return integer_declaration->byte_order; } -int bt_get_int_signedness(const struct definition *field) +int bt_get_int_signedness(const struct bt_definition *field) { struct definition_integer *integer_definition; const struct declaration_integer *integer_declaration; @@ -170,7 +170,7 @@ int bt_get_int_signedness(const struct definition *field) return integer_declaration->signedness; } -uint64_t bt_get_unsigned_int(const struct definition *field) +uint64_t bt_get_unsigned_int(const struct bt_definition *field) { struct definition_integer *integer_definition; const struct declaration_integer *integer_declaration; @@ -186,7 +186,7 @@ uint64_t bt_get_unsigned_int(const struct definition *field) return (uint64_t)integer_definition->value._signed; } -int64_t bt_get_signed_int(const struct definition *field) +int64_t bt_get_signed_int(const struct bt_definition *field) { struct definition_integer *integer_definition; const struct declaration_integer *integer_declaration;