Build fix

[babeltrace.git] / include / babeltrace / format.h

diff --git a/include/babeltrace/format.h b/include/babeltrace/format.h
index 539197299a37811ef02f5db6484f3065fc528331..c6dedc1afbd14279054708add6d766e6a5cd4c76 100644 (file)
--- a/include/babeltrace/format.h
+++ b/include/babeltrace/format.h
@@ -6,23 +6,20 @@
  *
  * Trace Format Header
  *
- * Copyright (c) 2010 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * 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.
+ * 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:
  *
- * 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.
- *
- * 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 <babeltrace/types.h>
 #include <stdint.h>
 #include <glib.h>
 
@@ -40,20 +37,9 @@ struct format {
                          const struct type_class_integer *int_class,
                          int64_t v);
 
-       uint64_t (*bitfield_unsigned_read)(struct stream_pos *pos,
-                       const struct type_class_bitfield *bitfield_class);
-       int64_t (*bitfield_signed_read)(struct stream_pos *pos,
-                       const struct type_class_bitfield *bitfield_class);
-       void (*bitfield_unsigned_write)(struct stream_pos *pos,
-                       const struct type_class_bitfield *bitfield_class,
-                       uint64_t v);
-       void (*bitfield_signed_write)(struct stream_pos *pos,
-                       const struct type_class_bitfield *bitfield_class,
-                       int64_t v);
-
-       void (*float_copy)(struct stream_pos *dest,
-                          struct stream_pos *src,
-                          const struct type_class_float *src);
+       void (*float_copy)(struct stream_pos *destp,
+                          struct stream_pos *srcp,
+                          const struct type_class_float *float_class);
        double (*double_read)(struct stream_pos *pos,
                              const struct type_class_float *float_class);
        void (*double_write)(struct stream_pos *pos,
@@ -73,11 +59,22 @@ struct format {
        void (*enum_write)(struct stream_pos *pos,
                           const struct type_class_enum *dest,
                           GQuark q);
-
+       void (*struct_begin)(struct stream_pos *pos,
+                            const struct type_class_struct *struct_class);
+       void (*struct_end)(struct stream_pos *pos,
+                          const struct type_class_struct *struct_class);
+       void (*array_begin)(struct stream_pos *pos,
+                            const struct type_class_array *array_class);
+       void (*array_end)(struct stream_pos *pos,
+                          const struct type_class_array *array_class);
+       void (*sequence_begin)(struct stream_pos *pos,
+                            const struct type_class_sequence *sequence_class);
+       void (*sequence_end)(struct stream_pos *pos,
+                          const struct type_class_sequence *sequence_class);
 };
 
 struct format *bt_lookup_format(GQuark qname);
-int bt_register_format(const struct format *format);
+int bt_register_format(struct format *format);
 
 /* TBD: format unregistration */