X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdaemon%2Ftypes_list.c;h=c3f590c15f5c51a203eeb40e8493de1b83606742;hb=f03ad26a9152f21c27a86103683b20ca116520bf;hp=89a08dd7f30ff61a45abe650fd2a7c2575654983;hpb=1035fba8812893e50d00a871e3399cc1ece3b384;p=collectd.git diff --git a/src/daemon/types_list.c b/src/daemon/types_list.c index 89a08dd7..c3f590c1 100644 --- a/src/daemon/types_list.c +++ b/src/daemon/types_list.c @@ -39,7 +39,7 @@ static int parse_ds(data_source_t *dsrc, char *buf, size_t buf_len) { int fields_num; if (buf_len < 11) { - ERROR("parse_ds: (buf_len = %zu) < 11", buf_len); + ERROR("parse_ds: (buf_len = %" PRIsz ") < 11", buf_len); return -1; } @@ -113,7 +113,7 @@ static void parse_line(char *buf) { sstrncpy(ds->type, fields[0], sizeof(ds->type)); ds->ds_num = fields_num - 1; - ds->ds = (data_source_t *)calloc(ds->ds_num, sizeof(data_source_t)); + ds->ds = calloc(ds->ds_num, sizeof(*ds->ds)); if (ds->ds == NULL) { sfree(ds); return; @@ -121,8 +121,8 @@ static void parse_line(char *buf) { for (size_t i = 0; i < ds->ds_num; i++) if (parse_ds(ds->ds + i, fields[i + 1], strlen(fields[i + 1])) != 0) { - ERROR("types_list: parse_line: Cannot parse data source #%zu " - "of data set %s", + ERROR("types_list: parse_line: Cannot parse data source #%" PRIsz + " of data set %s", i, ds->type); sfree(ds->ds); sfree(ds); @@ -174,11 +174,9 @@ int read_types_list(const char *file) { fh = fopen(file, "r"); if (fh == NULL) { - char errbuf[1024]; fprintf(stderr, "Failed to open types database `%s': %s.\n", file, - sstrerror(errno, errbuf, sizeof(errbuf))); - ERROR("Failed to open types database `%s': %s", file, - sstrerror(errno, errbuf, sizeof(errbuf))); + STRERRNO); + ERROR("Failed to open types database `%s': %s", file, STRERRNO); return -1; }