Merge branch 'master' of ssh://efficios.com/home/efficios/git/babeltrace

[babeltrace.git] / types / integer.c

diff --git a/types/integer.c b/types/integer.c
index 940963a51ec5a2fea08cb0cd197a21573303d8c8..e55c03e8a3cb353a96aff3019d700e573584f278 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);