if (buf_len < 11)
{
- ERROR ("parse_ds: (buf_len = %u) < 11", buf_len);
+ ERROR ("parse_ds: (buf_len = %zu) < 11", buf_len);
return (-1);
}
return (-1);
}
- strncpy (dsrc->name, fields[0], sizeof (dsrc->name));
- dsrc->name[sizeof (dsrc->name) - 1] = '\0';
+ sstrncpy (dsrc->name, fields[0], sizeof (dsrc->name));
if (strcasecmp (fields[1], "GAUGE") == 0)
dsrc->type = DS_TYPE_GAUGE;
else
dsrc->max = atof (fields[3]);
- DEBUG ("parse_ds: dsrc = {%s, %i, %lf, %lf};",
- dsrc->name, dsrc->type, dsrc->min, dsrc->max);
-
return (0);
} /* int parse_ds */
-static void parse_line (char *buf, size_t buf_len)
+static void parse_line (char *buf)
{
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;
- 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';
+ 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));
- 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;
- 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);
+ "of data set %s", i, ds->type);
return;
}
- DEBUG ("parse_line: ds = {%s, %i, %p};",
- 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)
if ((buf_len == 0) || (buf[0] == '#'))
continue;
- parse_line (buf, buf_len);
+ 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);
} /* while (fgets) */
} /* void parse_file */
-int read_types_list (void)
+int read_types_list (const char *file)
{
- const char *file;
FILE *fh;
- file = global_option_get ("TypesDB");
if (file == NULL)
- {
- ERROR ("global_option_get (\"TypesDB\") returned NULL.");
return (-1);
- }
fh = fopen (file, "r");
if (fh == NULL)
{
char errbuf[1024];
- ERROR ("open (%s) failed: %s",
+ 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)));
return (-1);
}