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

diff --git a/types/integer.c b/types/integer.c
index 7e996f27..936453af 100644
--- a/types/integer.c
+++ b/types/integer.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/align.h>
 #include <babeltrace/format.h>
+#include <babeltrace/types.h>
 #include <stdint.h>
 
 static
@@ -40,7 +49,7 @@ void _integer_declaration_free(struct declaration *declaration)
 }
 
 struct declaration_integer *
-	integer_declaration_new(size_t len, int byte_order,
+	bt_integer_declaration_new(size_t len, int byte_order,
 			 int signedness, size_t alignment, int base,
 			 enum ctf_string_encoding encoding,
 			 struct ctf_clock *clock)
@@ -76,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;
@@ -102,11 +111,66 @@ 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);
 }
 
-uint64_t get_unsigned_int(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;
+
+	integer_definition = container_of(field, struct definition_integer, p);
+	integer_declaration = integer_definition->declaration;
+
+	return integer_declaration->encoding;
+}
+
+int bt_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 bt_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 bt_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 bt_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 bt_get_unsigned_int(const struct definition *field)
 {
 	struct definition_integer *integer_definition;
 	const struct declaration_integer *integer_declaration;
@@ -117,11 +181,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 from 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 bt_get_signed_int(const struct definition *field)
 {
 	struct definition_integer *integer_definition;
 	const struct declaration_integer *integer_declaration;
@@ -132,6 +197,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 from an unsigned int (%s)\n", 
+		g_quark_to_string(field->name));
 	return (int64_t)integer_definition->value._unsigned;
 }