Merge branch 'master' of ssh://efficios.com/home/efficios/git/babeltrace

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

diff --git a/formats/ctf/types/variant.c b/formats/ctf/types/variant.c
index 78adca3da54d7506970231ec53802aa2486f73bf..d2ef7714dd8622407ca4a8255ef38168c5e449b8 100644 (file)
--- 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
@@ -18,12 +20,11 @@
 
 #include <babeltrace/ctf/types.h>
 
-void ctf_variant_begin(struct stream_pos *pos,
-                      const struct type_class_variant *variant_class)
+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_class_variant *variant_class)
-{
+       ctf_align_pos(pos, declaration->alignment);
+       return variant_rw(ppos, definition);
 }