projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #2722 from elfiesmelfie/increase_buffer
[collectd.git]
/
src
/
table.c
diff --git
a/src/table.c
b/src/table.c
index
d798820
..
20f0275
100644
(file)
--- a/
src/table.c
+++ b/
src/table.c
@@
-164,8
+164,7
@@
static int tbl_config_append_array_i(char *name, size_t **var, size_t *len,
tmp = realloc(*var, ((*len) + num) * sizeof(**var));
if (NULL == tmp) {
tmp = realloc(*var, ((*len) + num) * sizeof(**var));
if (NULL == tmp) {
- char errbuf[1024];
- log_err("realloc failed: %s.", sstrerror(errno, errbuf, sizeof(errbuf)));
+ log_err("realloc failed: %s.", STRERRNO);
return -1;
}
*var = tmp;
return -1;
}
*var = tmp;
@@
-187,8
+186,7
@@
static int tbl_config_result(tbl_t *tbl, oconfig_item_t *ci) {
tbl_result_t *res =
realloc(tbl->results, (tbl->results_num + 1) * sizeof(*tbl->results));
if (res == NULL) {
tbl_result_t *res =
realloc(tbl->results, (tbl->results_num + 1) * sizeof(*tbl->results));
if (res == NULL) {
- char errbuf[1024];
- log_err("realloc failed: %s.", sstrerror(errno, errbuf, sizeof(errbuf)));
+ log_err("realloc failed: %s.", STRERRNO);
return -1;
}
return -1;
}
@@
-245,8
+243,7
@@
static int tbl_config_table(oconfig_item_t *ci) {
tbl_t *tbl = realloc(tables, (tables_num + 1) * sizeof(*tables));
if (NULL == tbl) {
tbl_t *tbl = realloc(tables, (tables_num + 1) * sizeof(*tables));
if (NULL == tbl) {
- char errbuf[1024];
- log_err("realloc failed: %s.", sstrerror(errno, errbuf, sizeof(errbuf)));
+ log_err("realloc failed: %s.", STRERRNO);
return -1;
}
return -1;
}
@@
-339,8
+336,8
@@
static int tbl_prepare(tbl_t *tbl) {
}
if (res->values_num != res->ds->ds_num) {
}
if (res->values_num != res->ds->ds_num) {
- log_err("Invalid type \"%s\". Expected %
zu
data source%s, "
- "got %
zu
.",
+ log_err("Invalid type \"%s\". Expected %
" PRIsz "
data source%s, "
+ "got %
" PRIsz "
.",
res->type, res->values_num, (1 == res->values_num) ? "" : "s",
res->ds->ds_num);
return -1;
res->type, res->values_num, (1 == res->values_num) ? "" : "s",
res->ds->ds_num);
return -1;
@@
-433,7
+430,7
@@
static int tbl_parse_line(tbl_t *tbl, char *line, size_t len) {
if (i <= tbl->max_colnum) {
log_warn("Not enough columns in line "
if (i <= tbl->max_colnum) {
log_warn("Not enough columns in line "
- "(expected at least %
zu, got %zu
).",
+ "(expected at least %
" PRIsz ", got %" PRIsz "
).",
tbl->max_colnum + 1, i);
return -1;
}
tbl->max_colnum + 1, i);
return -1;
}
@@
-453,9
+450,7
@@
static int tbl_read_table(tbl_t *tbl) {
fh = fopen(tbl->file, "r");
if (NULL == fh) {
fh = fopen(tbl->file, "r");
if (NULL == fh) {
- char errbuf[1024];
- log_err("Failed to open file \"%s\": %s.", tbl->file,
- sstrerror(errno, errbuf, sizeof(errbuf)));
+ log_err("Failed to open file \"%s\": %s.", tbl->file, STRERRNO);
return -1;
}
return -1;
}
@@
-473,9
+468,7
@@
static int tbl_read_table(tbl_t *tbl) {
}
if (0 != ferror(fh)) {
}
if (0 != ferror(fh)) {
- char errbuf[1024];
- log_err("Failed to read from file \"%s\": %s.", tbl->file,
- sstrerror(errno, errbuf, sizeof(errbuf)));
+ log_err("Failed to read from file \"%s\": %s.", tbl->file, STRERRNO);
fclose(fh);
return -1;
}
fclose(fh);
return -1;
}