Add shared copyright to EfficiOS Inc. and Linux Foundation

[babeltrace.git] / formats / ctf / types / struct.c

diff --git a/formats/ctf/types/struct.c b/formats/ctf/types/struct.c
index 2a3fa4c5366c4c5730f988edb9cc74e2a812ed7a..adce6cbabb32211cddf296d6ab4dd36bdf1fd451 100644 (file)
--- 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,15 +20,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);
 }