X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Farray.c;h=43aee466e26c6919a053a54d18dfb9f9e6f056d8;hp=153a38e62e43e8c11a583a268c6285b0f5f9af8a;hb=4c8bfb7e0a9cef6e74cefa38ed54bf8cbd424183;hpb=d06d03dbf4babd3426818f23770e15058a6876c4

diff --git a/types/array.c b/types/array.c
index 153a38e6..43aee466 100644
--- a/types/array.c
+++ b/types/array.c
@@ -1,25 +1,23 @@
 /*
- * BabelTrace - Array Type Converter
+ * array.c
  *
- * Copyright (c) 2010 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * BabelTrace - Array 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/types.h>
+#include <babeltrace/format.h>
 
 void array_copy(struct stream_pos *dest, const struct format *fdest, 
 		struct stream_pos *src, const struct format *fsrc,
@@ -34,7 +32,7 @@ void array_copy(struct stream_pos *dest, const struct format *fdest,
 
 	for (i = 0; i < array_class->len; i++) {
 		struct type_class *elem_class = array_class->elem;
-		elem_class->copy(dest, fdest, src, fsrc, &elem_class->p);
+		elem_class->copy(dest, fdest, src, fsrc, elem_class);
 	}
 	fsrc->array_end(src, array_class);
 	fdest->array_end(dest, array_class);
@@ -42,13 +40,13 @@ void array_copy(struct stream_pos *dest, const struct format *fdest,
 
 void array_type_free(struct type_class_array *array_class)
 {
-	array_class->elem->free(&array_class->elem->p);
+	type_unref(array_class->elem);
 	g_free(array_class);
 }
 
 static void _array_type_free(struct type_class *type_class)
 {
-	struct type_class_struct *array_class =
+	struct type_class_array *array_class =
 		container_of(type_class, struct type_class_array, p);
 	array_type_free(array_class);
 }
@@ -57,17 +55,21 @@ struct type_class_array *array_type_new(const char *name, size_t len,
 					struct type_class *elem)
 {
 	struct type_class_array *array_class;
+	struct type_class *type_class;
 	int ret;
 
 	array_class = g_new(struct type_class_array, 1);
-	type_class = &float_class->p;
+	type_class = &array_class->p;
 
 	array_class->len = len;
+	type_ref(elem);
+	array_class->elem = elem;
 	type_class->name = g_quark_from_string(name);
 	/* No need to align the array, the first element will align itself */
 	type_class->alignment = 1;
 	type_class->copy = array_copy;
 	type_class->free = _array_type_free;
+	type_class->ref = 1;
 
 	if (type_class->name) {
 		ret = ctf_register_type(type_class);
@@ -77,6 +79,7 @@ struct type_class_array *array_type_new(const char *name, size_t len,
 	return array_class;
 
 error_register:
+	type_unref(array_class->elem);
 	g_free(array_class);
 	return NULL;
 }