X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Ftable.c;h=98858d26ecce694d65e9cf80ab3f72059e84d753;hb=c0a95e555ed8b58af9ff9e476ce1c13241a21ae3;hp=c6b5badfff43c7757686ec25cb7820a4bf2c42a9;hpb=09c6a320f3cb36b5dbb2c2ce43858f33be7acf9b;p=collectd.git diff --git a/src/table.c b/src/table.c index c6b5badf..98858d26 100644 --- a/src/table.c +++ b/src/table.c @@ -283,8 +283,9 @@ static int tbl_config_table (oconfig_item_t *ci) if (NULL == tbl->sep) { log_err ("Table \"%s\" does not specify any separator.", tbl->file); status = 1; + } else { + strunescape (tbl->sep, strlen (tbl->sep) + 1); } - strunescape (tbl->sep, strlen (tbl->sep) + 1); if (NULL == tbl->instance) { tbl->instance = sstrdup (tbl->file); @@ -351,9 +352,9 @@ static int tbl_prepare (tbl_t *tbl) return -1; } - if (res->values_num != (size_t)res->ds->ds_num) { + if (res->values_num != res->ds->ds_num) { log_err ("Invalid type \"%s\". Expected %zu data source%s, " - "got %i.", res->type, res->values_num, + "got %zu.", res->type, res->values_num, (1 == res->values_num) ? "" : "s", res->ds->ds_num); return -1;