Use the generic call to move_pos_slow

Replace two hardcoded calls to ctf_move_pos_slow by calls to the
function pointer registered when opening a trace.

Signed-off-by: Julien Desfossez <julien.desfossez@polymtl.ca>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/converter/babeltrace-lib.c b/converter/babeltrace-lib.c
index 075362175970858ccd919a84750aa7f59a0ed8ef..518ec6129dcaf622e072ebeac0613cd5ad8c6361 100644 (file)
--- a/converter/babeltrace-lib.c
+++ b/converter/babeltrace-lib.c
@@ -279,7 +279,7 @@ static int babeltrace_filestream_seek(struct ctf_file_stream *file_stream,
                 */
                break;
        case BT_SEEK_BEGIN:
-               ctf_move_pos_slow(&file_stream->pos, 0, SEEK_SET);
+               file_stream->pos.move_pos_slow(&file_stream->pos, 0, SEEK_SET);
                ret = stream_read_event(file_stream);
                break;
        case BT_SEEK_TIME:

diff --git a/include/babeltrace/ctf/types.h b/include/babeltrace/ctf/types.h
index 60749a6c9f8ec8b368413b19c47f84288025a270..68ccf7af6931ec5c06e204fb12da3457c3b7bb8f 100644 (file)
--- a/include/babeltrace/ctf/types.h
+++ b/include/babeltrace/ctf/types.h
@@ -192,7 +192,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);
-               ctf_move_pos_slow(pos, 0, SEEK_CUR);
+               pos->move_pos_slow(pos, 0, SEEK_CUR);
                printf_debug("ctf_move_pos_slow (after call): %zd\n",
                             pos->offset);
        }