X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Finteger.c;h=58b6104f9f08c73e78a9730796afd155962ead7d;hp=af5cc39fe8d98d589eb1ed2c5a6c249b546d592e;hb=9ffd39fc9c39e409991c1d3f800970cf58060dbb;hpb=fef0e5211cd1cb9a2acb5dad6045d15cfd75fe5b

diff --git a/types/integer.c b/types/integer.c
index af5cc39f..58b6104f 100644
--- a/types/integer.c
+++ b/types/integer.c
@@ -16,6 +16,14 @@
  *
  * 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>
@@ -77,7 +85,7 @@ struct definition *
 	int ret;
 
 	integer = g_new(struct definition_integer, 1);
-	declaration_ref(&integer_declaration->p);
+	bt_declaration_ref(&integer_declaration->p);
 	integer->p.declaration = declaration;
 	integer->declaration = integer_declaration;
 	integer->p.ref = 1;
@@ -103,11 +111,11 @@ void _integer_definition_free(struct definition *definition)
 	struct definition_integer *integer =
 		container_of(definition, struct definition_integer, p);
 
-	declaration_unref(integer->p.declaration);
+	bt_declaration_unref(integer->p.declaration);
 	g_free(integer);
 }
 
-enum ctf_string_encoding get_int_encoding(const struct definition *field)
+enum ctf_string_encoding bt_get_int_encoding(const struct definition *field)
 {
 	struct definition_integer *integer_definition;
 	const struct declaration_integer *integer_declaration;
@@ -118,7 +126,7 @@ enum ctf_string_encoding get_int_encoding(const struct definition *field)
 	return integer_declaration->encoding;
 }
 
-int get_int_base(const struct definition *field)
+int bt_get_int_base(const struct definition *field)
 {
 	struct definition_integer *integer_definition;
 	const struct declaration_integer *integer_declaration;
@@ -129,7 +137,7 @@ int get_int_base(const struct definition *field)
 	return integer_declaration->base;
 }
 
-size_t get_int_len(const struct definition *field)
+size_t bt_get_int_len(const struct definition *field)
 {
 	struct definition_integer *integer_definition;
 	const struct declaration_integer *integer_declaration;
@@ -140,7 +148,7 @@ size_t get_int_len(const struct definition *field)
 	return integer_declaration->len;
 }
 
-int get_int_byte_order(const struct definition *field)
+int bt_get_int_byte_order(const struct definition *field)
 {
 	struct definition_integer *integer_definition;
 	const struct declaration_integer *integer_declaration;
@@ -151,7 +159,7 @@ int get_int_byte_order(const struct definition *field)
 	return integer_declaration->byte_order;
 }
 
-int get_int_signedness(const struct definition *field)
+int bt_get_int_signedness(const struct definition *field)
 {
 	struct definition_integer *integer_definition;
 	const struct declaration_integer *integer_declaration;
@@ -162,7 +170,7 @@ int get_int_signedness(const struct definition *field)
 	return integer_declaration->signedness;
 }
 
-uint64_t get_unsigned_int(const struct definition *field)
+uint64_t bt_get_unsigned_int(const struct definition *field)
 {
 	struct definition_integer *integer_definition;
 	const struct declaration_integer *integer_declaration;
@@ -173,11 +181,12 @@ uint64_t get_unsigned_int(const struct definition *field)
 	if (!integer_declaration->signedness) {
 		return integer_definition->value._unsigned;
 	}
-	fprintf(stderr, "[warning] Extracting unsigned value in a signed int\n");
+	fprintf(stderr, "[warning] Extracting unsigned value from a signed int (%s)\n",
+		g_quark_to_string(field->name));
 	return (uint64_t)integer_definition->value._signed;
 }
 
-int64_t get_signed_int(const struct definition *field)
+int64_t bt_get_signed_int(const struct definition *field)
 {
 	struct definition_integer *integer_definition;
 	const struct declaration_integer *integer_declaration;
@@ -188,6 +197,7 @@ int64_t get_signed_int(const struct definition *field)
 	if (integer_declaration->signedness) {
 		return integer_definition->value._signed;
 	}
-	fprintf(stderr, "[warning] Extracting signed value in an unsigned int\n");
+	fprintf(stderr, "[warning] Extracting signed value from an unsigned int (%s)\n", 
+		g_quark_to_string(field->name));
 	return (int64_t)integer_definition->value._unsigned;
 }