X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Ftypes%2Fstruct.c;h=adce6cbabb32211cddf296d6ab4dd36bdf1fd451;hp=4eda7d6994d15b097f7a5d0d7f37b5d27cbf6f5b;hb=64fa3fec6c28f1d077812b4bfa06ae73b0f5999d;hpb=e19c3d69b39d2fa422ab54b5ec7192799f536680

diff --git a/formats/ctf/types/struct.c b/formats/ctf/types/struct.c
index 4eda7d69..adce6cba 100644
--- a/formats/ctf/types/struct.c
+++ b/formats/ctf/types/struct.c
@@ -3,7 +3,9 @@
  *
  * Structure format access functions.
  *
- * Copyright 2010 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation
+ *
+ * Author: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -18,13 +20,11 @@
 
 #include <babeltrace/ctf/types.h>
 
-void ctf_struct_begin(struct stream_pos *pos,
-		      const struct type_struct *struct_type)
+int ctf_struct_rw(struct stream_pos *ppos, struct definition *definition)
 {
-	align_pos(pos, struct_type->p.alignment);
-}
+	struct declaration *declaration = definition->declaration;
+	struct ctf_stream_pos *pos = ctf_pos(ppos);
 
-void ctf_struct_end(struct stream_pos *pos,
-		    const struct type_struct *struct_type)
-{
+	ctf_align_pos(pos, declaration->alignment);
+	return struct_rw(ppos, definition);
 }