X-Git-Url: https://git.efficios.com/?a=blobdiff_plain;f=types%2Fstring.c;h=f8778c845052709464f110cba1099ab662ce2e59;hb=7fb210365ad968646a0088d80f709165bf068950;hp=5796bf441483352def4791d7c147b21b414833c6;hpb=f66259163f060ada8d0fee348857c968e338ea40;p=babeltrace.git

diff --git a/types/string.c b/types/string.c
index 5796bf44..f8778c84 100644
--- a/types/string.c
+++ b/types/string.c
@@ -22,7 +22,8 @@
 
 static
 struct definition *_string_definition_new(struct declaration *declaration,
-				struct definition_scope *parent_scope);
+				struct definition_scope *parent_scope,
+				GQuark field_name, int index);
 static
 void _string_definition_free(struct definition *definition);
 
@@ -53,26 +54,28 @@ void _string_declaration_free(struct declaration *declaration)
 	g_free(string_declaration);
 }
 
-struct declaration_string *string_declaration_new(const char *name)
+struct declaration_string *
+	string_declaration_new(enum ctf_string_encoding encoding)
 {
 	struct declaration_string *string_declaration;
 
 	string_declaration = g_new(struct declaration_string, 1);
 	string_declaration->p.id = CTF_TYPE_STRING;
-	string_declaration->p.name = g_quark_from_string(name);
 	string_declaration->p.alignment = CHAR_BIT;
 	string_declaration->p.copy = string_copy;
 	string_declaration->p.declaration_free = _string_declaration_free;
 	string_declaration->p.definition_new = _string_definition_new;
 	string_declaration->p.definition_free = _string_definition_free;
 	string_declaration->p.ref = 1;
+	string_declaration->encoding = encoding;
 	return string_declaration;
 }
 
 static
 struct definition *
 	_string_definition_new(struct declaration *declaration,
-			       struct definition_scope *parent_scope)
+			       struct definition_scope *parent_scope,
+			       GQuark field_name, int index)
 {
 	struct declaration_string *string_declaration =
 		container_of(declaration, struct declaration_string, p);
@@ -83,6 +86,7 @@ struct definition *
 	string->p.declaration = declaration;
 	string->declaration = string_declaration;
 	string->p.ref = 1;
+	string->p.index = index;
 	string->value = NULL;
 	return &string->p;
 }