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

diff --git a/types/string.c b/types/string.c
index 6e5c6f47..0f261f41 100644
--- a/types/string.c
+++ b/types/string.c
@@ -27,21 +27,6 @@ struct definition *_string_definition_new(struct declaration *declaration,
 static
 void _string_definition_free(struct definition *definition);
 
-void string_copy(struct stream_pos *dest, const struct format *fdest, 
-		 struct stream_pos *src, const struct format *fsrc,
-		 struct definition *definition)
-{
-	struct definition_string *string =
-		container_of(definition, struct definition_string, p);
-	struct declaration_string *string_declaration = string->declaration;
-
-	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
 void _string_declaration_free(struct declaration *declaration)
 {
@@ -58,7 +43,6 @@ struct declaration_string *
 	string_declaration = g_new(struct declaration_string, 1);
 	string_declaration->p.id = CTF_TYPE_STRING;
 	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;
@@ -83,7 +67,11 @@ struct definition *
 	string->declaration = string_declaration;
 	string->p.ref = 1;
 	string->p.index = index;
+	string->p.name = field_name;
+	string->p.path = new_definition_path(parent_scope, field_name);
 	string->value = NULL;
+	string->len = 0;
+	string->alloc_len = 0;
 	return &string->p;
 }