X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Futils_cmd_getval.c;h=f747d5b862e8cf0770698d5e3ebf7d63f8b43ebb;hp=59046f6944cbe9d5c6fbdee1774843f71eddfdbf;hb=a9e50e9e30ecde17e167e271060c8183bfcbf407;hpb=9655d4a6d9fa2c4f02032759b831e93933d68bd9 diff --git a/src/utils_cmd_getval.c b/src/utils_cmd_getval.c index 59046f69..f747d5b8 100644 --- a/src/utils_cmd_getval.c +++ b/src/utils_cmd_getval.c @@ -78,9 +78,8 @@ cmd_status_t cmd_parse_getval(size_t argc, char **argv, #define print_to_socket(fh, ...) \ do { \ if (fprintf(fh, __VA_ARGS__) < 0) { \ - char errbuf[1024]; \ WARNING("cmd_handle_getval: failed to write to socket #%i: %s", \ - fileno(fh), sstrerror(errno, errbuf, sizeof(errbuf))); \ + fileno(fh), STRERRNO); \ return -1; \ } \ fflush(fh); \ @@ -132,8 +131,8 @@ cmd_status_t cmd_handle_getval(FILE *fh, char *buffer) { } if (ds->ds_num != values_num) { - ERROR("ds[%s]->ds_num = %zu, " - "but uc_get_rate_by_name returned %zu values.", + ERROR("ds[%s]->ds_num = %" PRIsz ", " + "but uc_get_rate_by_name returned %" PRIsz " values.", ds->type, ds->ds_num, values_num); cmd_error(CMD_ERROR, &err, "Error reading value from cache."); sfree(values); @@ -141,7 +140,7 @@ cmd_status_t cmd_handle_getval(FILE *fh, char *buffer) { return CMD_ERROR; } - print_to_socket(fh, "%zu Value%s found\n", values_num, + print_to_socket(fh, "%" PRIsz " Value%s found\n", values_num, (values_num == 1) ? "" : "s"); for (size_t i = 0; i < values_num; i++) { print_to_socket(fh, "%s=", ds->ds[i].name);