Add type class/type structure management

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

diff --git a/include/babeltrace/format.h b/include/babeltrace/format.h
index c6dedc1afbd14279054708add6d766e6a5cd4c76..24276fa46915275f7b059edde605ad59cef65a70 100644 (file)
--- a/include/babeltrace/format.h
+++ b/include/babeltrace/format.h
@@ -6,7 +6,7 @@
  *
  * Trace Format Header
  *
- * Copyright 2010 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010, 2011 - 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
@@ -48,13 +48,17 @@ struct format {
 
        void (*string_copy)(struct stream_pos *dest, struct stream_pos *src,
                            const struct type_class_string *string_class);
-       void (*string_read)(unsigned char **dest, struct stream_pos *src,
+       void (*string_read)(char **dest, struct stream_pos *src,
                            const struct type_class_string *string_class);
-       void (*string_write)(struct stream_pos *dest, const unsigned char *src,
+       void (*string_write)(struct stream_pos *dest, const char *src,
                             const struct type_class_string *string_class);
-       void (*string_free_temp)(unsigned char *string);
+       void (*string_free_temp)(char *string);
 
-       GQuark (*enum_read)(struct stream_pos *pos,
+       /*
+        * enum_read returns a GArray of GQuark. Must be released with
+        * g_array_unref().
+        */
+       GArray *(*enum_read)(struct stream_pos *pos,
                            const struct type_class_enum *src);
        void (*enum_write)(struct stream_pos *pos,
                           const struct type_class_enum *dest,
@@ -63,6 +67,10 @@ struct format {
                             const struct type_class_struct *struct_class);
        void (*struct_end)(struct stream_pos *pos,
                           const struct type_class_struct *struct_class);
+       void (*variant_begin)(struct stream_pos *pos,
+                             const struct type_class_variant *variant_class);
+       void (*variant_end)(struct stream_pos *pos,
+                           const struct type_class_variant *variant_class);
        void (*array_begin)(struct stream_pos *pos,
                             const struct type_class_array *array_class);
        void (*array_end)(struct stream_pos *pos,