diff options
| author | Emmanuel Vasilakis <mrzammler@mm.st> | 2021-10-22 15:56:46 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-22 15:56:46 +0300 |
| commit | 5377adb065af6d0e43973ff5f6b4344353dd1612 (patch) | |
| tree | 63d19c7704d3019743478efde28208448dab85ce /database | |
| parent | a97f06a6ebdcd4bf197cfb4249ed747a52ac9243 (diff) | |
Fix warnings from -Wformat-truncation=2 (#11676)
* mark host as UNUSED
* use snprintfz instead of snprintf. removes warning: %s directive output between 0 and 4096 bytes may exceed minimum required size of 4095
* increase length to 22 to include full int length. stops warning %d directive output may be truncated writing between 1 and 11 bytes into a region of size 5
* increase buffers to stop warning %0.1f directive output may be truncated writing between 3 and 312 bytes into a region of size 100
* use sprintfz
Diffstat (limited to 'database')
| -rw-r--r-- | database/engine/datafile.c | 4 | ||||
| -rw-r--r-- | database/engine/journalfile.c | 4 | ||||
| -rw-r--r-- | database/engine/metadata_log/logfile.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/database/engine/datafile.c b/database/engine/datafile.c index 7a052f963d..d423110790 100644 --- a/database/engine/datafile.c +++ b/database/engine/datafile.c @@ -51,7 +51,7 @@ static void datafile_init(struct rrdengine_datafile *datafile, struct rrdengine_ void generate_datafilepath(struct rrdengine_datafile *datafile, char *str, size_t maxlen) { - (void) snprintf(str, maxlen, "%s/" DATAFILE_PREFIX RRDENG_FILE_NUMBER_PRINT_TMPL DATAFILE_EXTENSION, + (void) snprintfz(str, maxlen, "%s/" DATAFILE_PREFIX RRDENG_FILE_NUMBER_PRINT_TMPL DATAFILE_EXTENSION, datafile->ctx->dbfiles_path, datafile->tier, datafile->fileno); } @@ -457,4 +457,4 @@ void finalize_data_files(struct rrdengine_instance *ctx) freez(datafile); } -}
\ No newline at end of file +} diff --git a/database/engine/journalfile.c b/database/engine/journalfile.c index e84f6a5af4..6406561613 100644 --- a/database/engine/journalfile.c +++ b/database/engine/journalfile.c @@ -94,7 +94,7 @@ void * wal_get_transaction_buffer(struct rrdengine_worker_config* wc, unsigned s void generate_journalfilepath(struct rrdengine_datafile *datafile, char *str, size_t maxlen) { - (void) snprintf(str, maxlen, "%s/" WALFILE_PREFIX RRDENG_FILE_NUMBER_PRINT_TMPL WALFILE_EXTENSION, + (void) snprintfz(str, maxlen, "%s/" WALFILE_PREFIX RRDENG_FILE_NUMBER_PRINT_TMPL WALFILE_EXTENSION, datafile->ctx->dbfiles_path, datafile->tier, datafile->fileno); } @@ -513,4 +513,4 @@ void init_commit_log(struct rrdengine_instance *ctx) ctx->commit_log.buf = NULL; ctx->commit_log.buf_pos = 0; ctx->commit_log.transaction_id = 1; -}
\ No newline at end of file +} diff --git a/database/engine/metadata_log/logfile.c b/database/engine/metadata_log/logfile.c index b7c5c06182..f5bd9b2d25 100644 --- a/database/engine/metadata_log/logfile.c +++ b/database/engine/metadata_log/logfile.c @@ -6,7 +6,7 @@ void generate_metadata_logfile_path(struct metadata_logfile *metalogfile, char *str, size_t maxlen) { - (void) snprintf(str, maxlen, "%s/" METALOG_PREFIX METALOG_FILE_NUMBER_PRINT_TMPL METALOG_EXTENSION, + (void) snprintfz(str, maxlen, "%s/" METALOG_PREFIX METALOG_FILE_NUMBER_PRINT_TMPL METALOG_EXTENSION, metalogfile->ctx->rrdeng_ctx->dbfiles_path, metalogfile->starting_fileno, metalogfile->fileno); } |