X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Fstring.c;h=daaeef5aa7514f00762e08b9cb79835663647645;hp=47e0970e890280b159d52d385a15cc0e60eed63b;hb=50052405724a3b901b258c00beb424751c579217;hpb=98df1c9fb24d5e7e10bf628692011e130e0d8339

diff --git a/types/string.c b/types/string.c
index 47e0970e..daaeef5a 100644
--- 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,6 +21,7 @@
 #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,
@@ -77,6 +80,7 @@ struct definition *
 	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;
@@ -96,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;
+}