Fix: do not use ctf-specific struct in format.h

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

diff --git a/include/babeltrace/ctf/types.h b/include/babeltrace/ctf/types.h
index 9cbb3387cabdea53042130f1101e79516bd97f26..05a026e79918fa86fa0fd881105a8cac6fb908eb 100644 (file)
--- a/include/babeltrace/ctf/types.h
+++ b/include/babeltrace/ctf/types.h
@@ -62,7 +62,7 @@ struct ctf_stream_pos {
        ssize_t offset;         /* offset from base, in bits. EOF for end of file. */
        ssize_t last_offset;    /* offset before the last read_event */
        size_t cur_index;       /* current index in packet index */
-       void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
+       void (*move_pos_slow)(struct stream_pos *pos, size_t offset,
                        int whence); /* function called to switch packet */
 
        int dummy;              /* dummy position, for length calculation */
@@ -90,7 +90,7 @@ int ctf_array_write(struct stream_pos *pos, struct definition *definition);
 int ctf_sequence_read(struct stream_pos *pos, struct definition *definition);
 int ctf_sequence_write(struct stream_pos *pos, struct definition *definition);
 
-void ctf_move_pos_slow(struct ctf_stream_pos *pos, size_t offset, int whence);
+void ctf_move_pos_slow(struct stream_pos *pos, size_t offset, int whence);
 
 void ctf_init_pos(struct ctf_stream_pos *pos, int fd, int open_flags);
 void ctf_fini_pos(struct ctf_stream_pos *pos);
@@ -118,7 +118,7 @@ void ctf_move_pos(struct ctf_stream_pos *pos, size_t bit_offset)
                        && (unlikely(pos->offset + bit_offset >= pos->packet_size))) {
                        printf_debug("ctf_move_pos_slow (before call): %zd\n",
                                     pos->offset);
-                       ctf_move_pos_slow(pos, bit_offset, SEEK_CUR);
+                       ctf_move_pos_slow(&pos->parent, bit_offset, SEEK_CUR);
                        printf_debug("ctf_move_pos_slow (after call): %zd\n",
                                     pos->offset);
                        return;
@@ -194,7 +194,7 @@ void ctf_pos_get_event(struct ctf_stream_pos *pos)
        if (pos->offset == pos->content_size) {
                printf_debug("ctf_move_pos_slow (before call): %zd\n",
                             pos->offset);
-               pos->move_pos_slow(pos, 0, SEEK_CUR);
+               pos->move_pos_slow(&pos->parent, 0, SEEK_CUR);
                printf_debug("ctf_move_pos_slow (after call): %zd\n",
                             pos->offset);
        }