#define BT_COMP_LOG_SELF_COMP (ds_file->self_comp)
#define BT_LOG_OUTPUT_LEVEL (ds_file->log_level)
#define BT_LOG_TAG "PLUGIN/SRC.CTF.FS/DS"
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
#include <stdlib.h>
#include <stdio.h>
if (whence != BT_MSG_ITER_SEEK_WHENCE_SET ||
offset < 0 || offset > file_size) {
BT_COMP_LOGE("Invalid medium seek request: whence=%d, offset=%jd, "
- "file-size=%jd", (int) whence, offset,
- file_size);
+ "file-size=%jd", (int) whence, (intmax_t) offset,
+ (intmax_t) file_size);
ret = BT_MSG_ITER_MEDIUM_STATUS_INVAL;
goto end;
}
int unmap_ret;
BT_COMP_LOGD("Medium seek request cannot be accomodated by the current "
"file mapping: offset=%jd, mmap-offset=%jd, "
- "mmap-len=%zu", offset, ds_file->mmap_offset,
+ "mmap-len=%zu", (intmax_t) offset, (intmax_t) ds_file->mmap_offset,
ds_file->mmap_len);
unmap_ret = ds_file_munmap(ds_file);
if (unmap_ret) {
if (i != 0 && index_entry->offset < prev_index_entry->offset) {
BT_COMP_LOGW("Invalid, non-monotonic, packet offset encountered in LTTng trace index file: "
"previous offset=%" PRIu64 ", current offset=%" PRIu64,
- (index_entry - 1)->offset, index_entry->offset);
+ prev_index_entry->offset, index_entry->offset);
goto error;
}
"packet-offset=%jd, packet-size-bytes=%jd, "
"file-size=%jd",
ds_file->file->path->str,
- current_packet_offset_bytes,
- current_packet_size_bytes,
- ds_file->file->size);
+ (intmax_t) current_packet_offset_bytes,
+ (intmax_t) current_packet_size_bytes,
+ (intmax_t) ds_file->file->size);
goto error;
}
current_packet_offset_bytes += current_packet_size_bytes;
BT_COMP_LOGD("Seeking to next packet: current-packet-offset=%jd, "
"next-packet-offset=%jd",
- current_packet_offset_bytes - current_packet_size_bytes,
- current_packet_offset_bytes);
+ (intmax_t) (current_packet_offset_bytes - current_packet_size_bytes),
+ (intmax_t) current_packet_offset_bytes);
} while (iter_status == BT_MSG_ITER_STATUS_OK);