X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Ftypes%2Fvariant.c;h=297f26ff5feb3f9e739e82fb8c7582f3dec6dfca;hp=4422f1088a4171a24bafc016c883861ef031f42f;hb=c462e188f3e7819c7bc74f671038cdbf36e8c3c0;hpb=e19c3d69b39d2fa422ab54b5ec7192799f536680

diff --git a/formats/ctf/types/variant.c b/formats/ctf/types/variant.c
index 4422f108..297f26ff 100644
--- a/formats/ctf/types/variant.c
+++ b/formats/ctf/types/variant.c
@@ -3,7 +3,9 @@
  *
  * Variant format access functions.
  *
- * Copyright 2011 - 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,16 +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_variant_begin(struct stream_pos *pos,
-		       const struct type_variant *variant_type)
+int ctf_variant_rw(struct stream_pos *ppos, struct definition *definition)
 {
-}
+	struct declaration *declaration = definition->declaration;
+	struct ctf_stream_pos *pos = ctf_pos(ppos);
 
-void ctf_variant_end(struct stream_pos *pos,
-		     const struct type_variant *variant_type)
-{
+	ctf_align_pos(pos, declaration->alignment);
+	return variant_rw(ppos, definition);
 }