Start packet mmap work

[babeltrace.git] / types / string.c

diff --git a/types/string.c b/types/string.c
index 41ac7576223b919920598d154e0eba64a5c46116..796f05cd6a47f555c2584993d89956b9479adf02 100644 (file)
--- a/types/string.c
+++ b/types/string.c
@@ -35,13 +35,14 @@ 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) {
+       if (fdest && (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);
+               if (fdest)
+                       fdest->string_write(dest, tmp, string_declaration);
                fsrc->string_free_temp(tmp);
        }
 }
@@ -54,19 +55,20 @@ 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;
 }