X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fctf.c;h=580133cc86c873fef4225e0bf3fbd65ff2019bb8;hb=d20f5e59af1c0db93913661a3daa92c087860e6e;hp=9a0e003a2fa3e5081ca331cad3c533c7223706af;hpb=a52d7f6a6dfe8c55b65eef0996b848873db39fe7;p=babeltrace.git

diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c
index 9a0e003a..580133cc 100644
--- a/formats/ctf/ctf.c
+++ b/formats/ctf/ctf.c
@@ -3,21 +3,17 @@
  *
  * Format registration.
  *
- * Copyright (c) 2010 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010, 2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * 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.
+ * 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:
  *
- * 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.
- *
- * 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/format.h>
@@ -25,15 +21,11 @@
 
 void __attribute__((constructor)) ctf_init(void);
 
-static const struct format ctf_format = {
+static struct format ctf_format = {
 	.uint_read = ctf_uint_read,
 	.int_read = ctf_int_read,
 	.uint_write = ctf_uint_write,
 	.int_write = ctf_int_write,
-	.bitfield_unsigned_read = ctf_bitfield_unsigned_read,
-	.bitfield_signed_read = ctf_bitfield_signed_read,
-	.bitfield_unsigned_write = ctf_bitfield_unsigned_write,
-	.bitfield_signed_write = ctf_bitfield_signed_write,
 	.double_read = ctf_double_read,
 	.double_write = ctf_double_write,
 	.float_copy = ctf_float_copy,
@@ -43,13 +35,21 @@ static const struct format ctf_format = {
 	.string_free_temp = ctf_string_free_temp,
 	.enum_read = ctf_enum_read,
 	.enum_write = ctf_enum_write,
+	.struct_begin = ctf_struct_begin,
+	.struct_end = ctf_struct_end,
+	.variant_begin = ctf_variant_begin,
+	.variant_end = ctf_variant_end,
+	.array_begin = ctf_array_begin,
+	.array_end = ctf_array_end,
+	.sequence_begin = ctf_sequence_begin,
+	.sequence_end = ctf_sequence_end,
 };
 
 void ctf_init(void)
 {
 	int ret;
 
-	ctf_format->name = g_quark_from_static_string("ctf");
+	ctf_format.name = g_quark_from_static_string("ctf");
 	ret = bt_register_format(&ctf_format);
 	assert(!ret);
 }