X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fformat.h;h=bc2bdb067c0b75b1041738d2317ccd1a4bf7e03c;hp=4981f122f4f69ba66cabe5703c5f13b375ec8029;hb=11796b9629d5a870163e4edd67e457576553aaef;hpb=fc93b2bdc2ced1d46fefb91fe79391afded8e504

diff --git a/include/babeltrace/format.h b/include/babeltrace/format.h
index 4981f122..bc2bdb06 100644
--- a/include/babeltrace/format.h
+++ b/include/babeltrace/format.h
@@ -29,34 +29,43 @@
 struct format {
 	GQuark name;
 
-	uint64_t (*uint_read)(const uint8_t *ptr, size_t len, int byte_order);
-	int64_t (*int_read)(const uint8_t *ptr, size_t len, int byte_order);
-	size_t (*uint_write)(uint8_t *ptr, size_t len, int byte_order, uint64_t v);
-	size_t (*int_write)(uint8_t *ptr, size_t len, int byte_order, int64_t v);
+	uint64_t (*uint_read)(struct stream_pos *pos,
+			const struct type_class_integer *int_class);
+	int64_t (*int_read)(struct stream_pos *pos,
+			const struct type_class_integer *int_class);
+	void (*uint_write)(struct stream_pos *pos,
+			   const struct type_class_integer *int_class,
+			   uint64_t v);
+	void (*int_write)(struct stream_pos *pos,
+			  const struct type_class_integer *int_class,
+			  int64_t v);
 
-	uint64_t (*bitfield_unsigned_read)(const unsigned char *ptr,
-					    unsigned long start, unsigned long len,
-					    int byte_order);
-	int64_t (*bitfield_signed_read)(const unsigned char *ptr,
-					 unsigned long start, unsigned long len,
-					 int byte_order);
-	size_t (*bitfield_unsigned_write)(unsigned char *ptr,
-					   unsigned long start, unsigned long len,
-					   int byte_order, uint64_t v);
-	size_t (*bitfield_signed_write)(unsigned char *ptr,
-					 unsigned long start, unsigned long len,
-					 int byte_order, int64_t v);
+	void (*float_copy)(struct stream_pos *dest,
+			   struct stream_pos *src,
+			   const struct type_class_float *src);
+	double (*double_read)(struct stream_pos *pos,
+			      const struct type_class_float *float_class);
+	void (*double_write)(struct stream_pos *pos,
+			     const struct type_class_float *float_class,
+			     double v);
 
+	void (*string_copy)(struct stream_pos *dest, struct stream_pos *src,
+			    const struct type_class_string *string_class);
+	void (*string_read)(unsigned char **dest, struct stream_pos *src,
+			    const struct type_class_string *string_class);
+	void (*string_write)(struct stream_pos *dest, const unsigned char *src,
+			     const struct type_class_string *string_class);
+	void (*string_free_temp)(unsigned char *string);
 
-	void (*float_copy)(unsigned char *destp, const struct type_class_float *dest,
-		    const unsigned char *srcp, const struct type_class_float *src);
-
-	size_t (*string_copy)(unsigned char *dest, const unsigned char *src);
-
-	GQuark (*enum_uint_to_quark)(const struct enum_table *table, uint64_t v);
-	GQuark (*enum_int_to_quark)(const struct enum_table *table, uint64_t v);
-	uint64_t (*enum_quark_to_uint)(size_t len, int byte_order, GQuark q);
-	int64_t (*enum_quark_to_int)(size_t len, int byte_order, GQuark q);
+	GQuark (*enum_read)(struct stream_pos *pos,
+			    const struct type_class_enum *src);
+	void (*enum_write)(struct stream_pos *pos,
+			   const struct type_class_enum *dest,
+			   GQuark q);
+	void (*struct_begin)(struct stream_pos *pos,
+			     const struct type_class_struct *struct_class);
+	void (*struct_end)(struct stream_pos *pos,
+			   const struct type_class_struct *struct_class);
 };
 
 struct format *bt_lookup_format(GQuark qname);