X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Fstring.c;h=6e5c6f472b41d115181e05c57962a3c9f8676476;hp=5796bf441483352def4791d7c147b21b414833c6;hb=dc48ecad637fc7fb8479da563ef2dfd3948cee73;hpb=f66259163f060ada8d0fee348857c968e338ea40

diff --git a/types/string.c b/types/string.c
index 5796bf44..6e5c6f47 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);
 
@@ -34,15 +35,11 @@ void string_copy(struct stream_pos *dest, const struct format *fdest,
 		container_of(definition, struct definition_string, p);
 	struct declaration_string *string_declaration = string->declaration;
 
-	if (fsrc->string_copy == fdest->string_copy) {
-		fsrc->string_copy(dest, src, string_declaration);
-	} else {
-		char *tmp = NULL;
-
-		fsrc->string_read(&tmp, src, string_declaration);
-		fdest->string_write(dest, tmp, string_declaration);
-		fsrc->string_free_temp(tmp);
-	}
+	g_free(string->value);
+	string->value = NULL;
+	fsrc->string_read(&string->value, src, string_declaration);
+	if (fdest)
+		fdest->string_write(dest, string->value, string_declaration);
 }
 
 static
@@ -53,26 +50,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 +82,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;
 }