X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fformat.h;h=ad2f0cd10f41435b09a3647aa47338a2d464d046;hb=d00d17d1e06065eb31a699ce59e16ceb6b858029;hp=6cae14efc3744ab7de264c7b672321a0857cd3de;hpb=e19c3d69b39d2fa422ab54b5ec7192799f536680;p=babeltrace.git

diff --git a/include/babeltrace/format.h b/include/babeltrace/format.h
index 6cae14ef..ad2f0cd1 100644
--- a/include/babeltrace/format.h
+++ b/include/babeltrace/format.h
@@ -27,31 +27,31 @@ struct format {
 	GQuark name;
 
 	uint64_t (*uint_read)(struct stream_pos *pos,
-			const struct type_integer *integer_type);
+		const struct declaration_integer *integer_declaration);
 	int64_t (*int_read)(struct stream_pos *pos,
-			const struct type_integer *integer_type);
+		const struct declaration_integer *integer_declaration);
 	void (*uint_write)(struct stream_pos *pos,
-			   const struct type_integer *integer_type,
-			   uint64_t v);
+		const struct declaration_integer *integer_declaration,
+		uint64_t v);
 	void (*int_write)(struct stream_pos *pos,
-			  const struct type_integer *integer_type,
-			  int64_t v);
+		const struct declaration_integer *integer_declaration,
+		int64_t v);
 
 	void (*float_copy)(struct stream_pos *destp,
-			   struct stream_pos *srcp,
-			   const struct type_float *float_type);
+		struct stream_pos *srcp,
+		const struct declaration_float *float_declaration);
 	double (*double_read)(struct stream_pos *pos,
-			      const struct type_float *float_type);
+		const struct declaration_float *float_declaration);
 	void (*double_write)(struct stream_pos *pos,
-			     const struct type_float *float_type,
-			     double v);
+		const struct declaration_float *float_declaration,
+		double v);
 
 	void (*string_copy)(struct stream_pos *dest, struct stream_pos *src,
-			    const struct type_string *string_type);
+		const struct declaration_string *string_declaration);
 	void (*string_read)(char **dest, struct stream_pos *src,
-			    const struct type_string *string_type);
+		const struct declaration_string *string_declaration);
 	void (*string_write)(struct stream_pos *dest, const char *src,
-			     const struct type_string *string_type);
+		const struct declaration_string *string_declaration);
 	void (*string_free_temp)(char *string);
 
 	/*
@@ -59,26 +59,26 @@ struct format {
 	 * g_array_unref().
 	 */
 	GArray *(*enum_read)(struct stream_pos *pos,
-			    const struct type_enum *src);
+		const struct declaration_enum *src);
 	void (*enum_write)(struct stream_pos *pos,
-			   const struct type_enum *dest,
-			   GQuark q);
+		const struct declaration_enum *dest,
+		GQuark q);
 	void (*struct_begin)(struct stream_pos *pos,
-			     const struct type_struct *struct_type);
+		const struct declaration_struct *struct_declaration);
 	void (*struct_end)(struct stream_pos *pos,
-			   const struct type_struct *struct_type);
+		const struct declaration_struct *struct_declaration);
 	void (*variant_begin)(struct stream_pos *pos,
-			      const struct type_variant *variant_type);
+		const struct declaration_variant *variant_declaration);
 	void (*variant_end)(struct stream_pos *pos,
-			    const struct type_variant *variant_type);
+		const struct declaration_variant *variant_declaration);
 	void (*array_begin)(struct stream_pos *pos,
-			     const struct type_array *array_type);
+		const struct declaration_array *array_declaration);
 	void (*array_end)(struct stream_pos *pos,
-			   const struct type_array *array_type);
+		const struct declaration_array *array_declaration);
 	void (*sequence_begin)(struct stream_pos *pos,
-			     const struct type_sequence *sequence_type);
+		const struct declaration_sequence *sequence_declaration);
 	void (*sequence_end)(struct stream_pos *pos,
-			   const struct type_sequence *sequence_type);
+		const struct declaration_sequence *sequence_declaration);
 };
 
 struct format *bt_lookup_format(GQuark qname);