X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf%2Ftypes.h;h=448ea9524ef897ca84c86279f360560f7823c0d1;hp=0f0615f49902614612ddc6045d34d6755a0f76e7;hb=ccd7e1c86f36342b0b06651cc52df86bb663c271;hpb=448d3cc7640830015850cc6287532d4c194fe690

diff --git a/include/babeltrace/ctf/types.h b/include/babeltrace/ctf/types.h
index 0f0615f4..448ea952 100644
--- a/include/babeltrace/ctf/types.h
+++ b/include/babeltrace/ctf/types.h
@@ -6,21 +6,17 @@
  *
  * 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 <stdint.h>
@@ -35,39 +31,54 @@
  * the size is returned.
  */
 
-uint64_t ctf_uint_read(const unsigned char *ptr, int byte_order, size_t len);
-int64_t ctf_int_read(const unsigned char *ptr, int byte_order, size_t len);
-size_t ctf_uint_write(unsigned char *ptr, int byte_order, size_t len, uint64_t v);
-size_t ctf_int_write(unsigned char *ptr, int byte_order, size_t len, int64_t v);
-
-uint64_t ctf_bitfield_unsigned_read(const unsigned char *ptr,
-				    unsigned long start, unsigned long len,
-				    int byte_order);
-int64_t ctf_bitfield_signed_read(const unsigned char *ptr,
-				 unsigned long start, unsigned long len,
-				 int byte_order);
-size_t ctf_bitfield_unsigned_write(unsigned char *ptr,
-				   unsigned long start, unsigned long len,
-				   int byte_order, uint64_t v);
-size_t ctf_bitfield_signed_write(unsigned char *ptr,
-				 unsigned long start, unsigned long len,
-				 int byte_order, int64_t v);
+uint64_t ctf_uint_read(struct stream_pos *pos,
+		const struct type_class_integer *int_class);
+int64_t ctf_int_read(struct stream_pos *pos,
+		const struct type_class_integer *int_class);
+void ctf_uint_write(struct stream_pos *pos,
+		const struct type_class_integer *int_class,
+		uint64_t v);
+void ctf_int_write(struct stream_pos *pos,
+		const struct type_class_integer *int_class,
+		int64_t v);
 
-double ctf_double_read(const unsigned char *ptr, const struct type_class_float *src);
-size_t ctf_double_write(unsigned char *ptr, const struct type_class_float *dest,
-		        double v);
-long double ctf_ldouble_read(const unsigned char *ptr,
+double ctf_double_read(struct stream_pos *pos,
+			const struct type_class_float *src);
+void ctf_double_write(struct stream_pos *pos,
+		const struct type_class_float *dest,
+		double v);
+long double ctf_ldouble_read(struct stream_pos *pos,
 			     const struct type_class_float *src);
-size_t ctf_ldouble_write(unsigned char *ptr, const struct type_class_float *dest,
-		         long double v);
-void ctf_float_copy(unsigned char *destp, const struct type_class_float *dest,
-		    const unsigned char *srcp, const struct type_class_float *src);
+void ctf_ldouble_write(struct stream_pos *pos,
+		const struct type_class_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);
 
-size_t ctf_string_copy(unsigned char *dest, const unsigned char *src);
+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);
 
-GQuark ctf_enum_read(const unsigned char *ptr,
-		     const struct type_class_enum *src);
-size_t ctf_enum_write(unsigned char *ptr, const struct type_class_enum *dest,
-		      GQuark q);
+GQuark ctf_enum_read(struct stream_pos *pos,
+		const struct type_class_enum *src);
+void ctf_enum_write(struct stream_pos *pos,
+		const struct type_class_enum *dest,
+		GQuark q);
+void ctf_struct_begin(struct stream_pos *pos,
+		      const struct type_class_struct *struct_class);
+void ctf_struct_end(struct stream_pos *pos,
+		    const struct type_class_struct *struct_class);
+void ctf_array_begin(struct stream_pos *pos,
+		     const struct type_class_array *array_class);
+void ctf_array_end(struct stream_pos *pos,
+		   const struct type_class_array *array_class);
+void ctf_sequence_begin(struct stream_pos *pos,
+			const struct type_class_sequence *sequence_class);
+void ctf_sequence_end(struct stream_pos *pos,
+		      const struct type_class_sequence *sequence_class);
 
 #endif /* _BABELTRACE_CTF_TYPES_H */