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

diff --git a/include/babeltrace/ctf/types.h b/include/babeltrace/ctf/types.h
index 2d06d6a5..75b8bd3e 100644
--- a/include/babeltrace/ctf/types.h
+++ b/include/babeltrace/ctf/types.h
@@ -35,47 +35,46 @@
  * 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_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);
 
-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);
-
-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);
 
-/*
- * A GQuark can be translated to/from strings with g_quark_from_string() and
- * g_quark_to_string().
- */
-GQuark ctf_enum_uint_to_quark(const struct enum_table *table, uint64_t v);
-GQuark ctf_enum_int_to_quark(const struct enum_table *table, uint64_t v);
-uint64_t ctf_enum_quark_to_uint(size_t len, int byte_order, GQuark q);
-int64_t ctf_enum_quark_to_int(size_t len, int byte_order, GQuark q);
-void ctf_enum_signed_insert(struct enum_table *table, int64_t v, GQuark q);
-void ctf_enum_unsigned_insert(struct enum_table *table, uint64_t v, GQuark q);
-struct enum_table *ctf_enum_new(void);
-void ctf_enum_destroy(struct enum_table *table);
+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);
 
 #endif /* _BABELTRACE_CTF_TYPES_H */