Add structures

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

diff --git a/include/babeltrace/format.h b/include/babeltrace/format.h
index 1a847846b6dc659e63459b49afdbfedd447267db..bc2bdb067c0b75b1041738d2317ccd1a4bf7e03c 100644 (file)
--- a/include/babeltrace/format.h
+++ b/include/babeltrace/format.h
@@ -40,36 +40,32 @@ 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 *destp,
-                          const struct type_class_float *dest,
-                          struct stream_pos *srcp,
+       void (*float_copy)(struct stream_pos *dest,
+                          struct stream_pos *src,
                           const struct type_class_float *src);
        double (*double_read)(struct stream_pos *pos,
-                             const struct type_class_float *src);
+                             const struct type_class_float *float_class);
        void (*double_write)(struct stream_pos *pos,
-                            const struct type_class_float *dest,
+                            const struct type_class_float *float_class,
                             double v);
 
        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,
+                           const struct type_class_string *string_class);
+       void (*string_write)(struct stream_pos *dest, const unsigned char *src,
+                            const struct type_class_string *string_class);
+       void (*string_free_temp)(unsigned char *string);
 
        GQuark (*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,
                           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);
 };
 
 struct format *bt_lookup_format(GQuark qname);