projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-4.0'
[collectd.git]
/
src
/
types_list.c
diff --git
a/src/types_list.c
b/src/types_list.c
index
847d098
..
002761c
100644
(file)
--- a/
src/types_list.c
+++ b/
src/types_list.c
@@
-33,7
+33,10
@@
static int parse_ds (data_source_t *dsrc, char *buf, size_t buf_len)
int fields_num;
if (buf_len < 11)
int fields_num;
if (buf_len < 11)
+ {
+ ERROR ("parse_ds: (buf_len = %u) < 11", buf_len);
return (-1);
return (-1);
+ }
if (buf[buf_len - 1] == ',')
{
if (buf[buf_len - 1] == ',')
{
@@
-54,7
+57,10
@@
static int parse_ds (data_source_t *dsrc, char *buf, size_t buf_len)
}
if (fields_num != 4)
}
if (fields_num != 4)
+ {
+ ERROR ("parse_ds: (fields_num = %i) != 4", fields_num);
return (-1);
return (-1);
+ }
strncpy (dsrc->name, fields[0], sizeof (dsrc->name));
dsrc->name[sizeof (dsrc->name) - 1] = '\0';
strncpy (dsrc->name, fields[0], sizeof (dsrc->name));
dsrc->name[sizeof (dsrc->name) - 1] = '\0';
@@
-64,7
+70,10
@@
static int parse_ds (data_source_t *dsrc, char *buf, size_t buf_len)
else if (strcasecmp (fields[1], "COUNTER") == 0)
dsrc->type = DS_TYPE_COUNTER;
else
else if (strcasecmp (fields[1], "COUNTER") == 0)
dsrc->type = DS_TYPE_COUNTER;
else
+ {
+ ERROR ("(fields[1] = %s) != (GAUGE || COUNTER)", fields[1]);
return (-1);
return (-1);
+ }
if (strcasecmp (fields[2], "U") == 0)
dsrc->min = NAN;
if (strcasecmp (fields[2], "U") == 0)
dsrc->min = NAN;
@@
-86,35
+95,43
@@
static void parse_line (char *buf, size_t buf_len)
{
char *fields[64];
size_t fields_num;
{
char *fields[64];
size_t fields_num;
- data_set_t ds;
+ data_set_t
*
ds;
int i;
fields_num = strsplit (buf, fields, 64);
if (fields_num < 2)
return;
int i;
fields_num = strsplit (buf, fields, 64);
if (fields_num < 2)
return;
- memset (&ds, '\0', sizeof (ds));
+ ds = (data_set_t *) malloc (sizeof (data_set_t));
+ if (ds == NULL)
+ return;
+
+ memset (ds, '\0', sizeof (data_set_t));
- strncpy (ds
.type, fields[0], sizeof (ds.
type));
- ds
.type[sizeof (ds.
type) - 1] = '\0';
+ strncpy (ds
->type, fields[0], sizeof (ds->
type));
+ ds
->type[sizeof (ds->
type) - 1] = '\0';
- ds
.
ds_num = fields_num - 1;
- ds
.ds = (data_source_t *) calloc (ds.
ds_num, sizeof (data_source_t));
- if (ds
.
ds == NULL)
+ ds
->
ds_num = fields_num - 1;
+ ds
->ds = (data_source_t *) calloc (ds->
ds_num, sizeof (data_source_t));
+ if (ds
->
ds == NULL)
return;
return;
- for (i = 0; i < ds
.
ds_num; i++)
- if (parse_ds (ds
.
ds + i, fields[i + 1], strlen (fields[i + 1])) != 0)
+ for (i = 0; i < ds
->
ds_num; i++)
+ if (parse_ds (ds
->
ds + i, fields[i + 1], strlen (fields[i + 1])) != 0)
{
{
- sfree (ds.ds);
+ sfree (ds->ds);
+ ERROR ("types_list: parse_line: Cannot parse data source #%i "
+ "of data set %s", i, ds->type);
return;
}
DEBUG ("parse_line: ds = {%s, %i, %p};",
return;
}
DEBUG ("parse_line: ds = {%s, %i, %p};",
- ds.type, ds.ds_num, (void *) ds.ds);
+ ds->type, ds->ds_num, (void *) ds->ds);
+
+ plugin_register_data_set (ds);
-
plugin_register_data_set (&
ds);
- sfree (ds
.ds
);
+
sfree (ds->
ds);
+ sfree (ds);
} /* void parse_line */
static void parse_file (FILE *fh)
} /* void parse_line */
static void parse_file (FILE *fh)
@@
-141,6
+158,13
@@
static void parse_file (FILE *fh)
if ((buf_len == 0) || (buf[0] == '#'))
continue;
if ((buf_len == 0) || (buf[0] == '#'))
continue;
+ while ((buf_len > 0) && ((buf[buf_len - 1] == '\n')
+ || (buf[buf_len - 1] == '\n')))
+ buf[--buf_len] = '\0';
+
+ if (buf_len == 0)
+ continue;
+
parse_line (buf, buf_len);
} /* while (fgets) */
} /* void parse_file */
parse_line (buf, buf_len);
} /* while (fgets) */
} /* void parse_file */
@@
-152,7
+176,10
@@
int read_types_list (void)
file = global_option_get ("TypesDB");
if (file == NULL)
file = global_option_get ("TypesDB");
if (file == NULL)
+ {
+ ERROR ("global_option_get (\"TypesDB\") returned NULL.");
return (-1);
return (-1);
+ }
fh = fopen (file, "r");
if (fh == NULL)
fh = fopen (file, "r");
if (fh == NULL)