X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Finteger.c;h=39c9f5c95bca6ee5d7315d855f985ed85cf76af1;hp=7e996f2786feeeb414f56b28f56a56cfbd1c6530;hb=0be8b6b76e1767f8d5f6b4c974df9a7d01eb91bc;hpb=56e603733d2a16aba6fdaf149ad6a4cd42e44eda

diff --git a/types/integer.c b/types/integer.c
index 7e996f27..39c9f5c9 100644
--- a/types/integer.c
+++ b/types/integer.c
@@ -21,6 +21,7 @@
 #include <babeltrace/compiler.h>
 #include <babeltrace/align.h>
 #include <babeltrace/format.h>
+#include <babeltrace/types.h>
 #include <stdint.h>
 
 static
@@ -106,7 +107,62 @@ void _integer_definition_free(struct definition *definition)
 	g_free(integer);
 }
 
-uint64_t get_unsigned_int(struct definition *field)
+enum ctf_string_encoding get_int_encoding(const struct definition *field)
+{
+	struct definition_integer *integer_definition;
+	const struct declaration_integer *integer_declaration;
+
+	integer_definition = container_of(field, struct definition_integer, p);
+	integer_declaration = integer_definition->declaration;
+
+	return integer_declaration->encoding;
+}
+
+int get_int_base(const struct definition *field)
+{
+	struct definition_integer *integer_definition;
+	const struct declaration_integer *integer_declaration;
+
+	integer_definition = container_of(field, struct definition_integer, p);
+	integer_declaration = integer_definition->declaration;
+
+	return integer_declaration->base;
+}
+
+size_t get_int_len(const struct definition *field)
+{
+	struct definition_integer *integer_definition;
+	const struct declaration_integer *integer_declaration;
+
+	integer_definition = container_of(field, struct definition_integer, p);
+	integer_declaration = integer_definition->declaration;
+
+	return integer_declaration->len;
+}
+
+int get_int_byte_order(const struct definition *field)
+{
+	struct definition_integer *integer_definition;
+	const struct declaration_integer *integer_declaration;
+
+	integer_definition = container_of(field, struct definition_integer, p);
+	integer_declaration = integer_definition->declaration;
+
+	return integer_declaration->byte_order;
+}
+
+int get_int_signedness(const struct definition *field)
+{
+	struct definition_integer *integer_definition;
+	const struct declaration_integer *integer_declaration;
+
+	integer_definition = container_of(field, struct definition_integer, p);
+	integer_declaration = integer_definition->declaration;
+
+	return integer_declaration->signedness;
+}
+
+uint64_t get_unsigned_int(const struct definition *field)
 {
 	struct definition_integer *integer_definition;
 	const struct declaration_integer *integer_declaration;
@@ -117,11 +173,12 @@ uint64_t get_unsigned_int(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 in a signed int (%s)\n",
+		g_quark_to_string(field->name));
 	return (uint64_t)integer_definition->value._signed;
 }
 
-int64_t get_signed_int(struct definition *field)
+int64_t get_signed_int(const struct definition *field)
 {
 	struct definition_integer *integer_definition;
 	const struct declaration_integer *integer_declaration;
@@ -132,6 +189,7 @@ int64_t get_signed_int(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 in an unsigned int (%s)\n", 
+		g_quark_to_string(field->name));
 	return (int64_t)integer_definition->value._unsigned;
 }