X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fformat.h;h=ac03dba78f48ab798c23e05f3e1196de83ca2ac9;hp=d31ee831bf15198cd1a2d21efb19d7bda9cd14f3;hb=448d3cc7640830015850cc6287532d4c194fe690;hpb=0a46062b3916eda6f871b5d80c4b97dcb3804d37

diff --git a/include/babeltrace/format.h b/include/babeltrace/format.h
index d31ee831..ac03dba7 100644
--- a/include/babeltrace/format.h
+++ b/include/babeltrace/format.h
@@ -31,36 +31,45 @@ struct format {
 
 	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);
+	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 (*bitfield_unsigned_read)(const unsigned char *ptr,
-					    unsigned long start, unsigned long len,
-					    int byte_order);
+					   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);
+					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);
+					  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)(unsigned char *destp, const struct type_class_float *dest,
-		    const unsigned char *srcp, const struct type_class_float *src);
-	double (*double_read)(const unsigned char *ptr, const struct type_class_float *src);
-	size_t (*double_write)(unsigned char *ptr, const struct type_class_float *dest,
-		        double v);
+					unsigned long start,
+					unsigned long len,
+					int byte_order, int64_t v);
 
+	void (*float_copy)(unsigned char *destp,
+			   const struct type_class_float *dest,
+			   const unsigned char *srcp,
+			    const struct type_class_float *src);
+	double (*double_read)(const unsigned char *ptr,
+			      const struct type_class_float *src);
+	size_t (*double_write)(unsigned char *ptr,
+			       const struct type_class_float *dest,
+			       double v);
 
 	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)(const unsigned char *ptr,
+			    const struct type_class_enum *src);
+	size_t (*enum_write)(unsigned char *ptr,
+			     const struct type_class_enum *dest,
+			     GQuark q);
+
 };
 
 struct format *bt_lookup_format(GQuark qname);