X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Ffloat.c;h=0fc137f7522b1e8c51d38db2b7ae0a40a682f940;hp=5ae831ce2a745e3beaeff5973f59ac051ffd7ec7;hb=9ffd39fc9c39e409991c1d3f800970cf58060dbb;hpb=98df1c9fb24d5e7e10bf628692011e130e0d8339 diff --git a/types/float.c b/types/float.c index 5ae831ce..0fc137f7 100644 --- a/types/float.c +++ b/types/float.c @@ -3,7 +3,9 @@ * * BabelTrace - Float Type Converter * - * Copyright 2010, 2011 - Mathieu Desnoyers + * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation + * + * Author: Mathieu Desnoyers * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -14,11 +16,20 @@ * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. */ #include #include -#include +#include +#include static struct definition *_float_definition_new(struct declaration *declaration, @@ -34,9 +45,9 @@ void _float_declaration_free(struct declaration *declaration) struct declaration_float *float_declaration = container_of(declaration, struct declaration_float, p); - declaration_unref(&float_declaration->exp->p); - declaration_unref(&float_declaration->mantissa->p); - declaration_unref(&float_declaration->sign->p); + bt_declaration_unref(&float_declaration->exp->p); + bt_declaration_unref(&float_declaration->mantissa->p); + bt_declaration_unref(&float_declaration->sign->p); g_free(float_declaration); } @@ -58,11 +69,14 @@ struct declaration_float * float_declaration->byte_order = byte_order; float_declaration->sign = integer_declaration_new(1, - byte_order, false, 1, 2); + byte_order, false, 1, 2, + CTF_STRING_NONE, NULL); float_declaration->mantissa = integer_declaration_new(mantissa_len - 1, - byte_order, false, 1, 10); + byte_order, false, 1, 10, + CTF_STRING_NONE, NULL); float_declaration->exp = integer_declaration_new(exp_len, - byte_order, true, 1, 10); + byte_order, true, 1, 10, + CTF_STRING_NONE, NULL); return float_declaration; } @@ -77,33 +91,32 @@ struct definition * container_of(declaration, struct declaration_float, p); struct definition_float *_float; struct definition *tmp; - int ret; _float = g_new(struct definition_float, 1); - declaration_ref(&float_declaration->p); + bt_declaration_ref(&float_declaration->p); _float->p.declaration = declaration; _float->declaration = float_declaration; - _float->scope = new_definition_scope(parent_scope, field_name, root_name); + _float->p.scope = new_definition_scope(parent_scope, field_name, root_name); _float->p.path = new_definition_path(parent_scope, field_name, root_name); if (float_declaration->byte_order == LITTLE_ENDIAN) { tmp = float_declaration->mantissa->p.definition_new(&float_declaration->mantissa->p, - _float->scope, g_quark_from_static_string("mantissa"), 0, NULL); + _float->p.scope, g_quark_from_static_string("mantissa"), 0, NULL); _float->mantissa = container_of(tmp, struct definition_integer, p); tmp = float_declaration->exp->p.definition_new(&float_declaration->exp->p, - _float->scope, g_quark_from_static_string("exp"), 1, NULL); + _float->p.scope, g_quark_from_static_string("exp"), 1, NULL); _float->exp = container_of(tmp, struct definition_integer, p); tmp = float_declaration->sign->p.definition_new(&float_declaration->sign->p, - _float->scope, g_quark_from_static_string("sign"), 2, NULL); + _float->p.scope, g_quark_from_static_string("sign"), 2, NULL); _float->sign = container_of(tmp, struct definition_integer, p); } else { tmp = float_declaration->sign->p.definition_new(&float_declaration->sign->p, - _float->scope, g_quark_from_static_string("sign"), 0, NULL); + _float->p.scope, g_quark_from_static_string("sign"), 0, NULL); _float->sign = container_of(tmp, struct definition_integer, p); tmp = float_declaration->exp->p.definition_new(&float_declaration->exp->p, - _float->scope, g_quark_from_static_string("exp"), 1, NULL); + _float->p.scope, g_quark_from_static_string("exp"), 1, NULL); _float->exp = container_of(tmp, struct definition_integer, p); tmp = float_declaration->mantissa->p.definition_new(&float_declaration->mantissa->p, - _float->scope, g_quark_from_static_string("mantissa"), 2, NULL); + _float->p.scope, g_quark_from_static_string("mantissa"), 2, NULL); _float->mantissa = container_of(tmp, struct definition_integer, p); } _float->p.ref = 1; @@ -114,9 +127,13 @@ struct definition * _float->p.index = root_name ? INT_MAX : index; _float->p.name = field_name; _float->value = 0.0; - ret = register_field_definition(field_name, &_float->p, - parent_scope); - assert(!ret); + if (parent_scope) { + int ret; + + ret = register_field_definition(field_name, &_float->p, + parent_scope); + assert(!ret); + } return &_float->p; } @@ -126,9 +143,10 @@ void _float_definition_free(struct definition *definition) struct definition_float *_float = container_of(definition, struct definition_float, p); - definition_unref(&_float->sign->p); - definition_unref(&_float->exp->p); - definition_unref(&_float->mantissa->p); - declaration_unref(_float->p.declaration); + bt_definition_unref(&_float->sign->p); + bt_definition_unref(&_float->exp->p); + bt_definition_unref(&_float->mantissa->p); + free_definition_scope(_float->p.scope); + bt_declaration_unref(_float->p.declaration); g_free(_float); }