projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
write_redis plugin: Fix copyright information.
[collectd.git]
/
src
/
types_list.c
diff --git
a/src/types_list.c
b/src/types_list.c
index
002761c
..
4971417
100644
(file)
--- a/
src/types_list.c
+++ b/
src/types_list.c
@@
-34,7
+34,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
+62,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);
}
@@
-85,13
+88,10
@@
static int parse_ds (data_source_t *dsrc, char *buf, size_t buf_len)
else
dsrc->max = atof (fields[3]);
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 */
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;
{
char *fields[64];
size_t fields_num;
@@
-108,8
+108,7
@@
static void parse_line (char *buf, size_t buf_len)
memset (ds, '\0', sizeof (data_set_t));
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));
@@
-125,9
+124,6
@@
static void parse_line (char *buf, size_t buf_len)
return;
}
return;
}
- DEBUG ("parse_line: ds = {%s, %i, %p};",
- ds->type, ds->ds_num, (void *) ds->ds);
-
plugin_register_data_set (ds);
sfree (ds->ds);
plugin_register_data_set (ds);
sfree (ds->ds);
@@
-165,27
+161,24
@@
static void parse_file (FILE *fh)
if (buf_len == 0)
continue;
if (buf_len == 0)
continue;
- parse_line (buf
, buf_len
);
+ parse_line (buf);
} /* while (fgets) */
} /* void parse_file */
} /* while (fgets) */
} /* void parse_file */
-int read_types_list (
void
)
+int read_types_list (
const char *file
)
{
{
- const char *file;
FILE *fh;
FILE *fh;
- file = global_option_get ("TypesDB");
if (file == NULL)
if (file == NULL)
- {
- ERROR ("global_option_get (\"TypesDB\") returned NULL.");
return (-1);
return (-1);
- }
fh = fopen (file, "r");
if (fh == NULL)
{
char errbuf[1024];
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);
}
file, sstrerror (errno, errbuf, sizeof (errbuf)));
return (-1);
}