Make the signedness warning useful with the field name

[babeltrace.git] / types / float.c

diff --git a/types/float.c b/types/float.c
index 78270e22aba3cf212ddeb6b6a390c871b5cdfeda..3e49a4b1fbc7c2c995cb7adc490de0fe49d61d6b 100644 (file)
--- 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
@@ -18,7 +20,8 @@
 
 #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,
@@ -59,13 +62,13 @@ struct declaration_float *
 
        float_declaration->sign = integer_declaration_new(1,
                                                byte_order, false, 1, 2,
-                                               CTF_STRING_NONE);
+                                               CTF_STRING_NONE, NULL);
        float_declaration->mantissa = integer_declaration_new(mantissa_len - 1,
                                                byte_order, false, 1, 10,
-                                               CTF_STRING_NONE);
+                                               CTF_STRING_NONE, NULL);
        float_declaration->exp = integer_declaration_new(exp_len,
                                                byte_order, true, 1, 10,
-                                               CTF_STRING_NONE);
+                                               CTF_STRING_NONE, NULL);
        return float_declaration;
 }
 
@@ -117,9 +120,11 @@ 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) {
+               ret = register_field_definition(field_name, &_float->p,
+                                               parent_scope);
+               assert(!ret);
+       }
        return &_float->p;
 }