X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf%2Ftypes.h;h=d0073e4c8d51d64459222df739286327a23a4142;hp=75b8bd3e28932f3f1d355a498d6bac82378ac457;hb=e19c3d69b39d2fa422ab54b5ec7192799f536680;hpb=11796b9629d5a870163e4edd67e457576553aaef

diff --git a/include/babeltrace/ctf/types.h b/include/babeltrace/ctf/types.h
index 75b8bd3e..d0073e4c 100644
--- a/include/babeltrace/ctf/types.h
+++ b/include/babeltrace/ctf/types.h
@@ -6,23 +6,20 @@
  *
  * Type header
  *
- * Copyright (c) 2010 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010 - 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/types.h>
 #include <stdint.h>
 #include <glib.h>
 
@@ -36,45 +33,58 @@
  */
 
 uint64_t ctf_uint_read(struct stream_pos *pos,
-		const struct type_class_integer *int_class);
+		const struct type_integer *integer_type);
 int64_t ctf_int_read(struct stream_pos *pos,
-		const struct type_class_integer *int_class);
+		const struct type_integer *integer_type);
 void ctf_uint_write(struct stream_pos *pos,
-		const struct type_class_integer *int_class,
+		const struct type_integer *integer_type,
 		uint64_t v);
 void ctf_int_write(struct stream_pos *pos,
-		const struct type_class_integer *int_class,
+		const struct type_integer *integer_type,
 		int64_t v);
 
 double ctf_double_read(struct stream_pos *pos,
-			const struct type_class_float *src);
+			const struct type_float *src);
 void ctf_double_write(struct stream_pos *pos,
-		const struct type_class_float *dest,
+		const struct type_float *dest,
 		double v);
 long double ctf_ldouble_read(struct stream_pos *pos,
-			     const struct type_class_float *src);
+			     const struct type_float *src);
 void ctf_ldouble_write(struct stream_pos *pos,
-		const struct type_class_float *dest,
+		const struct type_float *dest,
 		long double v);
-void ctf_float_copy(struct stream_pos *destp, const struct type_class_float *dest,
-		struct stream_pos *srcp, const struct type_class_float *src);
+void ctf_float_copy(struct stream_pos *destp,
+		struct stream_pos *srcp,
+		const struct type_float *float_type);
 
 void ctf_string_copy(struct stream_pos *dest, struct stream_pos *src,
-		     const struct type_class_string *string_class);
-void ctf_string_read(unsigned char **dest, struct stream_pos *src,
-		     const struct type_class_string *string_class);
-void ctf_string_write(struct stream_pos *dest, const unsigned char *src,
-		      const struct type_class_string *string_class);
-void ctf_string_free_temp(unsigned char *string);
+		     const struct type_string *string_type);
+void ctf_string_read(char **dest, struct stream_pos *src,
+		     const struct type_string *string_type);
+void ctf_string_write(struct stream_pos *dest, const char *src,
+		      const struct type_string *string_type);
+void ctf_string_free_temp(char *string);
 
-GQuark ctf_enum_read(struct stream_pos *pos,
-		const struct type_class_enum *src);
+GArray *ctf_enum_read(struct stream_pos *pos,
+		      const struct type_enum *src);
 void ctf_enum_write(struct stream_pos *pos,
-		const struct type_class_enum *dest,
+		const struct type_enum *dest,
 		GQuark q);
 void ctf_struct_begin(struct stream_pos *pos,
-		      const struct type_class_struct *struct_class);
+		      const struct type_struct *struct_type);
 void ctf_struct_end(struct stream_pos *pos,
-		    const struct type_class_struct *struct_class);
+		    const struct type_struct *struct_type);
+void ctf_variant_begin(struct stream_pos *pos,
+		       const struct type_variant *variant_type);
+void ctf_variant_end(struct stream_pos *pos,
+		     const struct type_variant *variant_type);
+void ctf_array_begin(struct stream_pos *pos,
+		     const struct type_array *array_type);
+void ctf_array_end(struct stream_pos *pos,
+		   const struct type_array *array_type);
+void ctf_sequence_begin(struct stream_pos *pos,
+			const struct type_sequence *sequence_type);
+void ctf_sequence_end(struct stream_pos *pos,
+		      const struct type_sequence *sequence_type);
 
 #endif /* _BABELTRACE_CTF_TYPES_H */