projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
perl plugin: Removed commented code
[collectd.git]
/
src
/
types_list.c
diff --git
a/src/types_list.c
b/src/types_list.c
index
3be792d
..
41bb403
100644
(file)
--- a/
src/types_list.c
+++ b/
src/types_list.c
@@
-24,6
+24,7
@@
#include "plugin.h"
#include "configfile.h"
#include "plugin.h"
#include "configfile.h"
+#include "types_list.h"
static int parse_ds (data_source_t *dsrc, char *buf, size_t buf_len)
{
static int parse_ds (data_source_t *dsrc, char *buf, size_t buf_len)
{
@@
-34,7
+35,7
@@
static int parse_ds (data_source_t *dsrc, char *buf, size_t buf_len)
if (buf_len < 11)
{
if (buf_len < 11)
{
- ERROR ("parse_ds: (buf_len = %u) < 11", buf_len);
+ ERROR ("parse_ds: (buf_len = %
z
u) < 11", buf_len);
return (-1);
}
return (-1);
}
@@
-62,16
+63,19
@@
static int parse_ds (data_source_t *dsrc, char *buf, size_t 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 if (strcasecmp (fields[1], "COUNTER") == 0)
dsrc->type = DS_TYPE_COUNTER;
if (strcasecmp (fields[1], "GAUGE") == 0)
dsrc->type = DS_TYPE_GAUGE;
else if (strcasecmp (fields[1], "COUNTER") == 0)
dsrc->type = DS_TYPE_COUNTER;
+ else if (strcasecmp (fields[1], "DERIVE") == 0)
+ dsrc->type = DS_TYPE_DERIVE;
+ else if (strcasecmp (fields[1], "ABSOLUTE") == 0)
+ dsrc->type = DS_TYPE_ABSOLUTE;
else
{
else
{
- ERROR ("(fields[1] = %s) != (GAUGE || COUNTER)", fields[1]);
+ ERROR ("(fields[1] = %s) != (GAUGE || COUNTER
|| DERIVE || ABSOLUTE
)", fields[1]);
return (-1);
}
return (-1);
}
@@
-99,14
+103,17
@@
static void parse_line (char *buf)
if (fields_num < 2)
return;
if (fields_num < 2)
return;
+ /* Ignore lines which begin with a hash sign. */
+ if (fields[0][0] == '#')
+ return;
+
ds = (data_set_t *) malloc (sizeof (data_set_t));
if (ds == NULL)
return;
memset (ds, '\0', sizeof (data_set_t));
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));
ds->ds_num = fields_num - 1;
ds->ds = (data_source_t *) calloc (ds->ds_num, sizeof (data_source_t));
@@
-153,7
+160,7
@@
static void parse_file (FILE *fh)
continue;
while ((buf_len > 0) && ((buf[buf_len - 1] == '\n')
continue;
while ((buf_len > 0) && ((buf[buf_len - 1] == '\n')
- || (buf[buf_len - 1] == '\
n
')))
+ || (buf[buf_len - 1] == '\
r
')))
buf[--buf_len] = '\0';
if (buf_len == 0)
buf[--buf_len] = '\0';
if (buf_len == 0)
@@
-174,7
+181,9
@@
int read_types_list (const char *file)
if (fh == NULL)
{
char errbuf[1024];
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);
}
file, sstrerror (errno, errbuf, sizeof (errbuf)));
return (-1);
}