From 76c176709c31cc4afb03564c2e9ec6028273ecc3 Mon Sep 17 00:00:00 2001 From: Matthieu Schaller Date: Wed, 17 Jul 2019 10:10:48 +0100 Subject: [PATCH 1/2] Fixes a bunch of warnings in some calls to sprintf() taht trigger (false-positives?) warnings with GCC 9.1.0 --- src/common_io.c | 4 ++-- src/parallel_io.c | 4 ++-- src/serial_io.c | 2 +- src/single_io.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/common_io.c b/src/common_io.c index 1c5befb86..b831c1d68 100644 --- a/src/common_io.c +++ b/src/common_io.c @@ -1901,8 +1901,8 @@ void io_check_output_fields(const struct swift_params* params, /* loop over each possible output field */ for (int field_id = 0; field_id < num_fields; field_id++) { char field_name[PARSER_MAX_LINE_SIZE]; - sprintf(field_name, "SelectOutput:%s_%s", list[field_id].name, - part_type_names[ptype]); + sprintf(field_name, "SelectOutput:%.*s_%s", FIELD_BUFFER_SIZE, + list[field_id].name, part_type_names[ptype]); if (strcmp(param_name, field_name) == 0) { found = 1; diff --git a/src/parallel_io.c b/src/parallel_io.c index db1fbe242..b90a3848d 100644 --- a/src/parallel_io.c +++ b/src/parallel_io.c @@ -1247,7 +1247,7 @@ void prepare_file(struct engine* e, const char* baseName, long long N_total[6], /* Did the user cancel this field? */ char field[PARSER_MAX_LINE_SIZE]; - sprintf(field, "SelectOutput:%s_%s", list[i].name, + sprintf(field, "SelectOutput:%.*s_%s", FIELD_BUFFER_SIZE, list[i].name, part_type_names[ptype]); int should_write = parser_get_opt_param_int(params, field, 1); @@ -1716,7 +1716,7 @@ void write_output_parallel(struct engine* e, const char* baseName, /* Did the user cancel this field? */ char field[PARSER_MAX_LINE_SIZE]; - sprintf(field, "SelectOutput:%s_%s", list[i].name, + sprintf(field, "SelectOutput:%.*s_%s", FIELD_BUFFER_SIZE, list[i].name, part_type_names[ptype]); int should_write = parser_get_opt_param_int(params, field, 1); diff --git a/src/serial_io.c b/src/serial_io.c index c05c69e1e..d0858766c 100644 --- a/src/serial_io.c +++ b/src/serial_io.c @@ -1359,7 +1359,7 @@ void write_output_serial(struct engine* e, const char* baseName, /* Did the user cancel this field? */ char field[PARSER_MAX_LINE_SIZE]; - sprintf(field, "SelectOutput:%s_%s", list[i].name, + sprintf(field, "SelectOutput:%.*s_%s", FIELD_BUFFER_SIZE, list[i].name, part_type_names[ptype]); int should_write = parser_get_opt_param_int(params, field, 1); diff --git a/src/single_io.c b/src/single_io.c index 7a7856d29..0a5d20236 100644 --- a/src/single_io.c +++ b/src/single_io.c @@ -1151,7 +1151,7 @@ void write_output_single(struct engine* e, const char* baseName, /* Did the user cancel this field? */ char field[PARSER_MAX_LINE_SIZE]; - sprintf(field, "SelectOutput:%s_%s", list[i].name, + sprintf(field, "SelectOutput:%.*s_%s", FIELD_BUFFER_SIZE, list[i].name, part_type_names[ptype]); int should_write = parser_get_opt_param_int(params, field, 1); -- GitLab From d36b30b2dec58448b35c127086242e4173f8c554 Mon Sep 17 00:00:00 2001 From: Matthieu Schaller Date: Wed, 17 Jul 2019 17:09:06 +0200 Subject: [PATCH 2/2] Applied code formatting tool. --- src/common_io.c | 4 ++-- src/serial_io.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common_io.c b/src/common_io.c index b831c1d68..2d2eaad5e 100644 --- a/src/common_io.c +++ b/src/common_io.c @@ -1901,8 +1901,8 @@ void io_check_output_fields(const struct swift_params* params, /* loop over each possible output field */ for (int field_id = 0; field_id < num_fields; field_id++) { char field_name[PARSER_MAX_LINE_SIZE]; - sprintf(field_name, "SelectOutput:%.*s_%s", FIELD_BUFFER_SIZE, - list[field_id].name, part_type_names[ptype]); + sprintf(field_name, "SelectOutput:%.*s_%s", FIELD_BUFFER_SIZE, + list[field_id].name, part_type_names[ptype]); if (strcmp(param_name, field_name) == 0) { found = 1; diff --git a/src/serial_io.c b/src/serial_io.c index d0858766c..220f7b3eb 100644 --- a/src/serial_io.c +++ b/src/serial_io.c @@ -1359,8 +1359,8 @@ void write_output_serial(struct engine* e, const char* baseName, /* Did the user cancel this field? */ char field[PARSER_MAX_LINE_SIZE]; - sprintf(field, "SelectOutput:%.*s_%s", FIELD_BUFFER_SIZE, list[i].name, - part_type_names[ptype]); + sprintf(field, "SelectOutput:%.*s_%s", FIELD_BUFFER_SIZE, + list[i].name, part_type_names[ptype]); int should_write = parser_get_opt_param_int(params, field, 1); if (should_write) -- GitLab