X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Ftypes%2Fstruct.c;h=21ce96f6d9eae370ebf0cd5ffe5d10000caab387;hp=70c08219953200be6baa3931659ca3f505fbb51b;hb=c462e188f3e7819c7bc74f671038cdbf36e8c3c0;hpb=ccd7e1c86f36342b0b06651cc52df86bb663c271

diff --git a/formats/ctf/types/struct.c b/formats/ctf/types/struct.c
index 70c08219..21ce96f6 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
@@ -14,17 +16,23 @@
  *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 
 #include <babeltrace/ctf/types.h>
 
-void ctf_struct_begin(struct stream_pos *pos,
-		      const struct type_class_struct *struct_class)
+int ctf_struct_rw(struct stream_pos *ppos, struct definition *definition)
 {
-	align_pos(pos, struct_class->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_class_struct *struct_class)
-{
+	ctf_align_pos(pos, declaration->alignment);
+	return struct_rw(ppos, definition);
 }