X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Fstring.c;h=a83a1541bb89a8f3ac1ef2149e5d9c0fbcd7281b;hp=f8778c845052709464f110cba1099ab662ce2e59;hb=809cbff588674d09c14b128eb95d332048382770;hpb=ab4cf05887a402e53396db43b5958918d0d2d022 diff --git a/types/string.c b/types/string.c index f8778c84..a83a1541 100644 --- a/types/string.c +++ b/types/string.c @@ -27,25 +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; - - 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); - } -} - static void _string_declaration_free(struct declaration *declaration) { @@ -62,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; @@ -88,6 +68,8 @@ struct definition * string->p.ref = 1; string->p.index = index; string->value = NULL; + string->len = 0; + string->alloc_len = 0; return &string->p; }