X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Fstring.c;h=d38d3cf33b45a24920a1114e1555d0521f73bc00;hp=df9bacac43260257d832c68ffd805f4e325bcf7c;hb=be85c1c7633af07e35db7b415d6ee8447c30e80a;hpb=bed864a75d2315c344a6e625db66ae9bfbc51e27

diff --git a/types/string.c b/types/string.c
index df9bacac..d38d3cf3 100644
--- a/types/string.c
+++ b/types/string.c
@@ -1,26 +1,24 @@
 /*
- * BabelTrace - String Type Converter
+ * string.c
  *
- * Copyright (c) 2010 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * BabelTrace - String Type Converter
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * Copyright 2010 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  */
 
 #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,
@@ -32,7 +30,11 @@ 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 {
-		/* TODO */
+		unsigned char *tmp = NULL;
+
+		fsrc->string_read(&tmp, src, string_class);
+		fdest->string_write(dest, tmp, string_class);
+		fsrc->string_free_temp(tmp);
 	}
 }
 
@@ -58,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;