X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf%2Ftypes.h;h=473bbff9df4918e1159faa87e741c34d8fd127c5;hp=0f0615f49902614612ddc6045d34d6755a0f76e7;hb=bed864a75d2315c344a6e625db66ae9bfbc51e27;hpb=90b676d73fc6f817958083c0f159028a2f0b40ca;ds=sidebyside

diff --git a/include/babeltrace/ctf/types.h b/include/babeltrace/ctf/types.h
index 0f0615f4..473bbff9 100644
--- a/include/babeltrace/ctf/types.h
+++ b/include/babeltrace/ctf/types.h
@@ -35,39 +35,48 @@
  * 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);
+uint64_t ctf_bitfield_unsigned_read(struct stream_pos *pos,
+			const struct type_class_bitfield *bitfield_class);
+int64_t ctf_bitfield_signed_read(struct stream_pos *pos,
+			const struct type_class_bitfield *bitfield_class);
+void ctf_bitfield_unsigned_write(struct stream_pos *pos,
+			const struct type_class_bitfield *bitfield_class,
+			uint64_t v);
+void ctf_bitfield_signed_write(struct stream_pos *pos,
+			const struct type_class_bitfield *bitfield_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);
 
-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);
 
 #endif /* _BABELTRACE_CTF_TYPES_H */