X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Ffloat.c;h=cc6c957aeebe09ebc6124cc4cdf8db985f558893;hp=5ae831ce2a745e3beaeff5973f59ac051ffd7ec7;hb=64fa3fec6c28f1d077812b4bfa06ae73b0f5999d;hpb=98df1c9fb24d5e7e10bf628692011e130e0d8339

diff --git a/types/float.c b/types/float.c
index 5ae831ce..cc6c957a 100644
--- a/types/float.c
+++ b/types/float.c
@@ -3,7 +3,9 @@
  *
  * BabelTrace - Float Type Converter
  *
- * Copyright 2010, 2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation
+ *
+ * Author: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -58,11 +60,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);
 	float_declaration->mantissa = integer_declaration_new(mantissa_len - 1,
-						byte_order, false, 1, 10);
+						byte_order, false, 1, 10,
+						CTF_STRING_NONE);
 	float_declaration->exp = integer_declaration_new(exp_len,
-					   byte_order, true, 1, 10);
+						byte_order, true, 1, 10,
+						CTF_STRING_NONE);
 	return float_declaration;
 }
 
@@ -83,27 +88,27 @@ struct definition *
 	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;
@@ -129,6 +134,7 @@ void _float_definition_free(struct definition *definition)
 	definition_unref(&_float->sign->p);
 	definition_unref(&_float->exp->p);
 	definition_unref(&_float->mantissa->p);
+	free_definition_scope(_float->p.scope);
 	declaration_unref(_float->p.declaration);
 	g_free(_float);
 }