X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Ftypes%2Fstruct.c;h=2913f4d0e2d41d6099e6cfda5ce18339826b224c;hb=98df1c9fb24d5e7e10bf628692011e130e0d8339;hp=2a3fa4c5366c4c5730f988edb9cc74e2a812ed7a;hpb=46322b331aefc5739efd841df72d1928e35050e6;p=babeltrace.git

diff --git a/formats/ctf/types/struct.c b/formats/ctf/types/struct.c
index 2a3fa4c5..2913f4d0 100644
--- a/formats/ctf/types/struct.c
+++ b/formats/ctf/types/struct.c
@@ -18,15 +18,11 @@
 
 #include <babeltrace/ctf/types.h>
 
-void ctf_struct_begin(struct stream_pos *ppos,
-		      const struct declaration_struct *struct_declaration)
+int ctf_struct_rw(struct stream_pos *ppos, struct definition *definition)
 {
+	struct declaration *declaration = definition->declaration;
 	struct ctf_stream_pos *pos = ctf_pos(ppos);
 
-	ctf_align_pos(pos, struct_declaration->p.alignment);
-}
-
-void ctf_struct_end(struct stream_pos *ppos,
-		    const struct declaration_struct *struct_declaration)
-{
+	ctf_align_pos(pos, declaration->alignment);
+	return struct_rw(ppos, definition);
 }