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

diff --git a/formats/ctf/types/struct.c b/formats/ctf/types/struct.c
index 3aa8d587..adce6cba 100644
--- a/formats/ctf/types/struct.c
+++ b/formats/ctf/types/struct.c
@@ -1,26 +1,30 @@
 /*
  * Common Trace Format
  *
- * Structure write/access functions.
+ * Structure format access functions.
  *
- * Copyright (c) 2010 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * Author: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  */
 
-#include <ctf/ctf-types.h>
-#include <glib.h>
+#include <babeltrace/ctf/types.h>
 
+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, declaration->alignment);
+	return struct_rw(ppos, definition);
+}