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);
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);
}
}
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);
string->p.declaration = declaration;
string->declaration = string_declaration;
string->p.ref = 1;
+ string->p.index = index;
string->value = NULL;
return &string->p;
}