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

diff --git a/types/float.c b/types/float.c
index cc6c957a..7b89a89f 100644
--- a/types/float.c
+++ b/types/float.c
@@ -16,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 <babeltrace/compiler.h>
 #include <babeltrace/format.h>
-#include <endian.h>
+#include <babeltrace/types.h>
+#include <babeltrace/endian.h>
 
 static
 struct definition *_float_definition_new(struct declaration *declaration,
@@ -36,14 +45,14 @@ 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);
 }
 
 struct declaration_float *
-	float_declaration_new(size_t mantissa_len,
+	bt_float_declaration_new(size_t mantissa_len,
 		       size_t exp_len, int byte_order, size_t alignment)
 {
 	struct declaration_float *float_declaration;
@@ -59,15 +68,15 @@ struct declaration_float *
 	declaration->ref = 1;
 	float_declaration->byte_order = byte_order;
 
-	float_declaration->sign = integer_declaration_new(1,
+	float_declaration->sign = bt_integer_declaration_new(1,
 						byte_order, false, 1, 2,
-						CTF_STRING_NONE);
-	float_declaration->mantissa = integer_declaration_new(mantissa_len - 1,
+						CTF_STRING_NONE, NULL);
+	float_declaration->mantissa = bt_integer_declaration_new(mantissa_len - 1,
 						byte_order, false, 1, 10,
-						CTF_STRING_NONE);
-	float_declaration->exp = integer_declaration_new(exp_len,
+						CTF_STRING_NONE, NULL);
+	float_declaration->exp = bt_integer_declaration_new(exp_len,
 						byte_order, true, 1, 10,
-						CTF_STRING_NONE);
+						CTF_STRING_NONE, NULL);
 	return float_declaration;
 }
 
@@ -82,10 +91,9 @@ 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->p.scope = new_definition_scope(parent_scope, field_name, root_name);
@@ -119,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;
 }
 
@@ -131,10 +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);
+	bt_definition_unref(&_float->sign->p);
+	bt_definition_unref(&_float->exp->p);
+	bt_definition_unref(&_float->mantissa->p);
 	free_definition_scope(_float->p.scope);
-	declaration_unref(_float->p.declaration);
+	bt_declaration_unref(_float->p.declaration);
 	g_free(_float);
 }