Fix: emf uri: surround by " "

[babeltrace.git] / types / string.c

diff --git a/types/string.c b/types/string.c
index f8778c845052709464f110cba1099ab662ce2e59..daaeef5aa7514f00762e08b9cb79835663647645 100644 (file)
--- a/types/string.c
+++ b/types/string.c
@@ -3,7 +3,9 @@
  *
  * BabelTrace - String Type Converter
  *
- * Copyright 2010, 2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation
+ *
+ * Author: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -19,33 +21,16 @@
 #include <babeltrace/compiler.h>
 #include <babeltrace/align.h>
 #include <babeltrace/format.h>
+#include <babeltrace/types.h>
 
 static
 struct definition *_string_definition_new(struct declaration *declaration,
                                struct definition_scope *parent_scope,
-                               GQuark field_name, int index);
+                               GQuark field_name, int index,
+                               const char *root_name);
 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 +47,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;
@@ -75,19 +59,34 @@ static
 struct definition *
        _string_definition_new(struct declaration *declaration,
                               struct definition_scope *parent_scope,
-                              GQuark field_name, int index)
+                              GQuark field_name, int index,
+                              const char *root_name)
 {
        struct declaration_string *string_declaration =
                container_of(declaration, struct declaration_string, p);
        struct definition_string *string;
+       int ret;
 
        string = g_new(struct definition_string, 1);
        declaration_ref(&string_declaration->p);
        string->p.declaration = declaration;
        string->declaration = string_declaration;
        string->p.ref = 1;
-       string->p.index = index;
+       /*
+        * Use INT_MAX order to ensure that all fields of the parent
+        * scope are seen as being prior to this scope.
+        */
+       string->p.index = root_name ? INT_MAX : index;
+       string->p.name = field_name;
+       string->p.path = new_definition_path(parent_scope, field_name,
+                                       root_name);
+       string->p.scope = NULL;
        string->value = NULL;
+       string->len = 0;
+       string->alloc_len = 0;
+       ret = register_field_definition(field_name, &string->p,
+                                       parent_scope);
+       assert(!ret);
        return &string->p;
 }
 
@@ -101,3 +100,24 @@ void _string_definition_free(struct definition *definition)
        g_free(string->value);
        g_free(string);
 }
+
+enum ctf_string_encoding get_string_encoding(const struct definition *field)
+{
+       struct definition_string *string_definition;
+       const struct declaration_string *string_declaration;
+
+       string_definition = container_of(field, struct definition_string, p);
+       string_declaration = string_definition->declaration;
+
+       return string_declaration->encoding;
+}
+
+char *get_string(const struct definition *field)
+{
+       struct definition_string *string_definition =
+               container_of(field, struct definition_string, p);
+
+       assert(string_definition->value != NULL);
+
+       return string_definition->value;
+}