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

[babeltrace.git] / types / struct.c

diff --git a/types/struct.c b/types/struct.c
index a9703b28e4859a00f59f59894c2a0a37762c0305..188be82cadb95592864162cd47f8b8fcd5c21f48 100644 (file)
--- a/types/struct.c
+++ b/types/struct.c
@@ -3,7 +3,9 @@
  *
  * BabelTrace - Structure 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
@@ -118,7 +120,7 @@ struct definition *
        _struct->p.index = root_name ? INT_MAX : index;
        _struct->p.name = field_name;
        _struct->p.path = new_definition_path(parent_scope, field_name, root_name);
-       _struct->scope = new_definition_scope(parent_scope, field_name, root_name);
+       _struct->p.scope = new_definition_scope(parent_scope, field_name, root_name);
 
        ret = register_field_definition(field_name, &_struct->p,
                                        parent_scope);
@@ -134,7 +136,7 @@ struct definition *
                        (struct definition **) &g_ptr_array_index(_struct->fields, i);
 
                *field = declaration_field->declaration->definition_new(declaration_field->declaration,
-                                                         _struct->scope,
+                                                         _struct->p.scope,
                                                          declaration_field->name, i, NULL);
                if (!*field)
                        goto error;
@@ -146,7 +148,7 @@ error:
                struct definition *field = g_ptr_array_index(_struct->fields, i);
                definition_unref(field);
        }
-       free_definition_scope(_struct->scope);
+       free_definition_scope(_struct->p.scope);
        declaration_unref(&struct_declaration->p);
        g_free(_struct);
        return NULL;
@@ -164,7 +166,7 @@ void _struct_definition_free(struct definition *definition)
                struct definition *field = g_ptr_array_index(_struct->fields, i);
                definition_unref(field);
        }
-       free_definition_scope(_struct->scope);
+       free_definition_scope(_struct->p.scope);
        declaration_unref(_struct->p.declaration);
        g_free(_struct);
 }