From: Ruben Kerkhof Date: Sun, 5 Mar 2017 16:51:09 +0000 (+0100) Subject: utils_cmd_flush.c: fix build warning X-Git-Tag: collectd-5.8.0~217 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d39c84c17623270f89c3b3c5f4f2994e0ca88c50;p=collectd.git utils_cmd_flush.c: fix build warning CC src/utils_cmd_flush.lo src/utils_cmd_flush.c:139:12: warning: declaration shadows a local variable [-Wshadow] char buffer[1024]; ^ src/utils_cmd_flush.c:108:47: note: previous declaration is here cmd_status_t cmd_handle_flush(FILE *fh, char *buffer) { ^ --- diff --git a/src/utils_cmd_flush.c b/src/utils_cmd_flush.c index 9e8950bb..f7f024ed 100644 --- a/src/utils_cmd_flush.c +++ b/src/utils_cmd_flush.c @@ -136,18 +136,18 @@ cmd_status_t cmd_handle_flush(FILE *fh, char *buffer) { for (size_t j = 0; (j == 0) || (j < cmd.cmd.flush.identifiers_num); j++) { char *identifier = NULL; - char buffer[1024]; + char buf[1024]; int status; if (cmd.cmd.flush.identifiers_num != 0) { identifier_t *id = cmd.cmd.flush.identifiers + j; - if (format_name(buffer, sizeof(buffer), id->host, id->plugin, + if (format_name(buf, sizeof(buf), id->host, id->plugin, id->plugin_instance, id->type, id->type_instance) != 0) { error++; continue; } - identifier = buffer; + identifier = buf; } status = plugin_flush(plugin, DOUBLE_TO_CDTIME_T(cmd.cmd.flush.timeout),