X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Fstring.c;h=ab0ec72c30da53209355a229bf35aaefbd60867e;hp=4d57914112fe3a7aceeed0abda1621168e8d22f5;hb=380d60b1bd3c5d1a709dca3eeb8e718598fed235;hpb=ccd7e1c86f36342b0b06651cc52df86bb663c271

diff --git a/types/string.c b/types/string.c
index 4d579141..ab0ec72c 100644
--- a/types/string.c
+++ b/types/string.c
@@ -18,7 +18,7 @@
 
 #include <babeltrace/compiler.h>
 #include <babeltrace/align.h>
-#include <babeltrace/types.h>
+#include <babeltrace/format.h>
 
 void string_copy(struct stream_pos *dest, const struct format *fdest, 
 		 struct stream_pos *src, const struct format *fsrc,
@@ -30,7 +30,7 @@ void string_copy(struct stream_pos *dest, const struct format *fdest,
 	if (fsrc->string_copy == fdest->string_copy) {
 		fsrc->string_copy(dest, src, string_class);
 	} else {
-		unsigned char *tmp = NULL;
+		char *tmp = NULL;
 
 		fsrc->string_read(&tmp, src, string_class);
 		fdest->string_write(dest, tmp, string_class);
@@ -60,8 +60,9 @@ struct type_class_string *string_type_new(const char *name)
 	string_class->p.alignment = CHAR_BIT;
 	string_class->p.copy = string_copy;
 	string_class->p.free = _string_type_free;
+	string_class->p.ref = 1;
 	if (string_class->p.name) {
-		ret = ctf_register_type(&string_class->p);
+		ret = register_type(&string_class->p);
 		if (ret) {
 			g_free(string_class);
 			return NULL;