Helper function to extract string from fields

[babeltrace.git] / types / integer.c

diff --git a/types/integer.c b/types/integer.c
index 940963a51ec5a2fea08cb0cd197a21573303d8c8..9e6df588f9764537a9969a0937274b941fa70aa8 100644 (file)
--- a/types/integer.c
+++ b/types/integer.c
@@ -3,7 +3,9 @@
  *
  * BabelTrace - Integer 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
@@ -39,7 +41,8 @@ void _integer_declaration_free(struct declaration *declaration)
 
 struct declaration_integer *
        integer_declaration_new(size_t len, int byte_order,
-                        int signedness, size_t alignment, int base)
+                        int signedness, size_t alignment, int base,
+                        enum ctf_string_encoding encoding)
 {
        struct declaration_integer *integer_declaration;
 
@@ -54,6 +57,7 @@ struct declaration_integer *
        integer_declaration->byte_order = byte_order;
        integer_declaration->signedness = signedness;
        integer_declaration->base = base;
+       integer_declaration->encoding = encoding;
        return integer_declaration;
 }
 
@@ -82,6 +86,7 @@ struct definition *
        integer->p.name = field_name;
        integer->p.path = new_definition_path(parent_scope, field_name,
                                        root_name);
+       integer->p.scope = NULL;
        integer->value._unsigned = 0;
        ret = register_field_definition(field_name, &integer->p,
                                        parent_scope);
@@ -98,3 +103,33 @@ void _integer_definition_free(struct definition *definition)
        declaration_unref(integer->p.declaration);
        g_free(integer);
 }
+
+uint64_t get_unsigned_int(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;
+
+       if (!integer_declaration->signedness) {
+               return integer_definition->value._unsigned;
+       }
+       fprintf(stderr, "[warning] Extracting unsigned value in a signed int\n");
+       return (uint64_t)integer_definition->value._signed;
+}
+
+int64_t get_signed_int(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;
+
+       if (integer_declaration->signedness) {
+               return integer_definition->value._signed;
+       }
+       fprintf(stderr, "[warning] Extracting signed value in an unsigned int\n");
+       return (int64_t)integer_definition->value._unsigned;
+}