Rename "type" to "declaration"

[babeltrace.git] / include / babeltrace / ctf / types.h

diff --git a/include/babeltrace/ctf/types.h b/include/babeltrace/ctf/types.h
index 448ea9524ef897ca84c86279f360560f7823c0d1..73288ef6681117bb8b8bd839f5bf5fc3f5f738fd 100644 (file)
--- a/include/babeltrace/ctf/types.h
+++ b/include/babeltrace/ctf/types.h
@@ -19,6 +19,7 @@
  * all copies or substantial portions of the Software.
  */
 
+#include <babeltrace/types.h>
 #include <stdint.h>
 #include <glib.h>
 
@@ -32,53 +33,58 @@
  */
 
 uint64_t ctf_uint_read(struct stream_pos *pos,
-               const struct type_class_integer *int_class);
+               const struct declaration_integer *integer_declaration);
 int64_t ctf_int_read(struct stream_pos *pos,
-               const struct type_class_integer *int_class);
+               const struct declaration_integer *integer_declaration);
 void ctf_uint_write(struct stream_pos *pos,
-               const struct type_class_integer *int_class,
+               const struct declaration_integer *integer_declaration,
                uint64_t v);
 void ctf_int_write(struct stream_pos *pos,
-               const struct type_class_integer *int_class,
+               const struct declaration_integer *integer_declaration,
                int64_t v);
 
 double ctf_double_read(struct stream_pos *pos,
-                       const struct type_class_float *src);
+                       const struct declaration_float *src);
 void ctf_double_write(struct stream_pos *pos,
-               const struct type_class_float *dest,
+               const struct declaration_float *dest,
                double v);
 long double ctf_ldouble_read(struct stream_pos *pos,
-                            const struct type_class_float *src);
+                            const struct declaration_float *src);
 void ctf_ldouble_write(struct stream_pos *pos,
-               const struct type_class_float *dest,
+               const struct declaration_float *dest,
                long double v);
-void ctf_float_copy(struct stream_pos *destp, const struct type_class_float *dest,
-               struct stream_pos *srcp, const struct type_class_float *src);
+void ctf_float_copy(struct stream_pos *destp,
+               struct stream_pos *srcp,
+               const struct declaration_float *float_declaration);
 
 void ctf_string_copy(struct stream_pos *dest, struct stream_pos *src,
-                    const struct type_class_string *string_class);
-void ctf_string_read(unsigned char **dest, struct stream_pos *src,
-                    const struct type_class_string *string_class);
-void ctf_string_write(struct stream_pos *dest, const unsigned char *src,
-                     const struct type_class_string *string_class);
-void ctf_string_free_temp(unsigned char *string);
+               const struct declaration_string *string_declaration);
+void ctf_string_read(char **dest, struct stream_pos *src,
+               const struct declaration_string *string_declaration);
+void ctf_string_write(struct stream_pos *dest, const char *src,
+               const struct declaration_string *string_declaration);
+void ctf_string_free_temp(char *string);
 
-GQuark ctf_enum_read(struct stream_pos *pos,
-               const struct type_class_enum *src);
+GArray *ctf_enum_read(struct stream_pos *pos,
+               const struct declaration_enum *src);
 void ctf_enum_write(struct stream_pos *pos,
-               const struct type_class_enum *dest,
+               const struct declaration_enum *dest,
                GQuark q);
 void ctf_struct_begin(struct stream_pos *pos,
-                     const struct type_class_struct *struct_class);
+               const struct declaration_struct *struct_declaration);
 void ctf_struct_end(struct stream_pos *pos,
-                   const struct type_class_struct *struct_class);
+               const struct declaration_struct *struct_declaration);
+void ctf_variant_begin(struct stream_pos *pos,
+               const struct declaration_variant *variant_declaration);
+void ctf_variant_end(struct stream_pos *pos,
+               const struct declaration_variant *variant_declaration);
 void ctf_array_begin(struct stream_pos *pos,
-                    const struct type_class_array *array_class);
+               const struct declaration_array *array_declaration);
 void ctf_array_end(struct stream_pos *pos,
-                  const struct type_class_array *array_class);
+               const struct declaration_array *array_declaration);
 void ctf_sequence_begin(struct stream_pos *pos,
-                       const struct type_class_sequence *sequence_class);
+               const struct declaration_sequence *sequence_declaration);
 void ctf_sequence_end(struct stream_pos *pos,
-                     const struct type_class_sequence *sequence_class);
+               const struct declaration_sequence *sequence_declaration);
 
 #endif /* _BABELTRACE_CTF_TYPES_H */