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.5' into collectd-4.6
[collectd.git]
/
src
/
configfile.c
diff --git
a/src/configfile.c
b/src/configfile.c
index
bdb63a9
..
c929d00
100644
(file)
--- a/
src/configfile.c
+++ b/
src/configfile.c
@@
-1,6
+1,6
@@
/**
* collectd - src/configfile.c
/**
* collectd - src/configfile.c
- * Copyright (C) 2005-200
8
Florian octo Forster
+ * Copyright (C) 2005-200
9
Florian octo Forster
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@
-98,7
+98,9
@@
static cf_global_option_t cf_global_options[] =
{"Hostname", NULL, NULL},
{"FQDNLookup", NULL, "false"},
{"Interval", NULL, "10"},
{"Hostname", NULL, NULL},
{"FQDNLookup", NULL, "false"},
{"Interval", NULL, "10"},
- {"ReadThreads", NULL, "5"}
+ {"ReadThreads", NULL, "5"},
+ {"PreCacheChain", NULL, "PreCache"},
+ {"PostCacheChain", NULL, "PostCache"}
};
static int cf_global_options_num = STATIC_ARRAY_LEN (cf_global_options);
};
static int cf_global_options_num = STATIC_ARRAY_LEN (cf_global_options);
@@
-156,7
+158,8
@@
static int cf_dispatch (const char *type, const char *orig_key,
for (i = 0; i < cf_cb->keys_num; i++)
{
for (i = 0; i < cf_cb->keys_num; i++)
{
- if (strcasecmp (cf_cb->keys[i], key) == 0)
+ if ((cf_cb->keys[i] != NULL)
+ && (strcasecmp (cf_cb->keys[i], key) == 0))
{
ret = (*cf_cb->callback) (key, value);
break;
{
ret = (*cf_cb->callback) (key, value);
break;
@@
-205,13
+208,18
@@
static int dispatch_value_typesdb (const oconfig_item_t *ci)
cf_default_typesdb = 0;
cf_default_typesdb = 0;
- if (ci->values_num < 1)
+ if (ci->values_num < 1) {
+ ERROR ("configfile: `TypesDB' needs at least one argument.");
return (-1);
return (-1);
+ }
for (i = 0; i < ci->values_num; ++i)
{
for (i = 0; i < ci->values_num; ++i)
{
- if (OCONFIG_TYPE_STRING != ci->values[i].type)
+ if (OCONFIG_TYPE_STRING != ci->values[i].type) {
+ WARNING ("configfile: TypesDB: Skipping %i. argument which "
+ "is not a string.", i + 1);
continue;
continue;
+ }
read_types_list (ci->values[i].value.string);
}
read_types_list (ci->values[i].value.string);
}
@@
-552,7
+560,7
@@
static oconfig_item_t *cf_read_dir (const char *dir, int depth)
status = ssnprintf (name, sizeof (name), "%s/%s",
dir, de->d_name);
status = ssnprintf (name, sizeof (name), "%s/%s",
dir, de->d_name);
- if (
status >= sizeof (name
))
+ if (
(status < 0) || ((size_t) status >= sizeof (name)
))
{
ERROR ("configfile: Not including `%s/%s' because its"
" name is too long.",
{
ERROR ("configfile: Not including `%s/%s' because its"
" name is too long.",
@@
-627,7
+635,7
@@
static oconfig_item_t *cf_read_generic (const char *path, int depth)
int status;
const char *path_ptr;
wordexp_t we;
int status;
const char *path_ptr;
wordexp_t we;
-
in
t i;
+
size_
t i;
if (depth >= CF_MAX_DEPTH)
{
if (depth >= CF_MAX_DEPTH)
{