diff options
| author | Vladimir Kobal <vlad@prokk.net> | 2022-02-21 12:23:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-21 12:23:48 +0200 |
| commit | d8b7b6a25f7fc0ec4d79a7f8a72c779e3bf4afd7 (patch) | |
| tree | 8fba2db960467dcbbd3cba0660d1a874c16783db /database | |
| parent | ad72a83afdd5fbd1075d1d1f3cc97edfdea4650e (diff) | |
Fix compilation warnings on macOS (#12082)
Diffstat (limited to 'database')
| -rw-r--r-- | database/engine/journalfile.c | 2 | ||||
| -rw-r--r-- | database/rrdset.c | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/database/engine/journalfile.c b/database/engine/journalfile.c index 6406561613..ad5f7befc7 100644 --- a/database/engine/journalfile.c +++ b/database/engine/journalfile.c @@ -428,7 +428,7 @@ static uint64_t iterate_transactions(struct rrdengine_instance *ctx, struct rrde iov = uv_buf_init(buf, size_bytes); ret = uv_fs_read(NULL, &req, file, &iov, 1, pos, NULL); if (ret < 0) { - error("uv_fs_read: pos=%lu, %s", pos, uv_strerror(ret)); + error("uv_fs_read: pos=%"PRIu64", %s", pos, uv_strerror(ret)); uv_fs_req_cleanup(&req); goto skip_file; } diff --git a/database/rrdset.c b/database/rrdset.c index 19af449d8d..39f11d8ea2 100644 --- a/database/rrdset.c +++ b/database/rrdset.c @@ -1475,7 +1475,14 @@ void rrdset_done(RRDSET *st) { // check if we will re-write the entire page if(unlikely(st->rrd_memory_mode == RRD_MEMORY_MODE_DBENGINE && dt_usec(&st->last_collected_time, &st->last_updated) > (RRDENG_BLOCK_SIZE / sizeof(storage_number)) * update_every_ut)) { - info("%s: too old data (last updated at %ld.%ld, last collected at %ld.%ld). Resetting it. Will not store the next entry.", st->name, st->last_updated.tv_sec, st->last_updated.tv_usec, st->last_collected_time.tv_sec, st->last_collected_time.tv_usec); + info( + "%s: too old data (last updated at %" PRId64 ".%" PRId64 ", last collected at %" PRId64 ".%" PRId64 "). " + "Resetting it. Will not store the next entry.", + st->name, + (int64_t)st->last_updated.tv_sec, + (int64_t)st->last_updated.tv_usec, + (int64_t)st->last_collected_time.tv_sec, + (int64_t)st->last_collected_time.tv_usec); rrdset_reset(st); rrdset_init_last_updated_time(st); |