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 #1455 from rubenk/configure-ac-remove-dead-code
[collectd.git]
/
src
/
table.c
diff --git
a/src/table.c
b/src/table.c
index
b0bc95f
..
aebf0bb
100644
(file)
--- a/
src/table.c
+++ b/
src/table.c
@@
-190,7
+190,7
@@
static int tbl_config_result (tbl_t *tbl, oconfig_item_t *ci)
res = (tbl_result_t *)realloc (tbl->results,
(tbl->results_num + 1) * sizeof (*tbl->results));
res = (tbl_result_t *)realloc (tbl->results,
(tbl->results_num + 1) * sizeof (*tbl->results));
- if (
NULL == tbl
) {
+ if (
res == NULL
) {
char errbuf[1024];
log_err ("realloc failed: %s.",
sstrerror (errno, errbuf, sizeof (errbuf)));
char errbuf[1024];
log_err ("realloc failed: %s.",
sstrerror (errno, errbuf, sizeof (errbuf)));
@@
-458,7
+458,7
@@
static int tbl_parse_line (tbl_t *tbl, char *line, size_t len)
}
if (i <= tbl->max_colnum) {
}
if (i <= tbl->max_colnum) {
- log_
err
("Not enough columns in line "
+ log_
warn
("Not enough columns in line "
"(expected at least %zu, got %zu).",
tbl->max_colnum + 1, i);
return -1;
"(expected at least %zu, got %zu).",
tbl->max_colnum + 1, i);
return -1;
@@
-490,11
+490,11
@@
static int tbl_read_table (tbl_t *tbl)
while (NULL != fgets (buf, sizeof (buf), fh)) {
if ('\0' != buf[sizeof (buf) - 1]) {
buf[sizeof (buf) - 1] = '\0';
while (NULL != fgets (buf, sizeof (buf), fh)) {
if ('\0' != buf[sizeof (buf) - 1]) {
buf[sizeof (buf) - 1] = '\0';
- log_
err
("Table %s: Truncated line: %s", tbl->file, buf);
+ log_
warn
("Table %s: Truncated line: %s", tbl->file, buf);
}
if (0 != tbl_parse_line (tbl, buf, sizeof (buf))) {
}
if (0 != tbl_parse_line (tbl, buf, sizeof (buf))) {
- log_
err
("Table %s: Failed to parse line: %s", tbl->file, buf);
+ log_
warn
("Table %s: Failed to parse line: %s", tbl->file, buf);
continue;
}
}
continue;
}
}