projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #2729 from cekstam/add-scale-and-shift-to-modbus
[collectd.git]
/
src
/
daemon
/
configfile.c
diff --git
a/src/daemon/configfile.c
b/src/daemon/configfile.c
index
0d295c1
..
2830a86
100644
(file)
--- a/
src/daemon/configfile.c
+++ b/
src/daemon/configfile.c
@@
-76,7
+76,7
@@
typedef struct cf_value_map_s {
typedef struct cf_global_option_s {
const char *key;
char *value;
typedef struct cf_global_option_s {
const char *key;
char *value;
-
_B
ool from_cli; /* value set from CLI */
+
b
ool from_cli; /* value set from CLI */
const char *def;
} cf_global_option_t;
const char *def;
} cf_global_option_t;
@@
-91,8
+91,8
@@
static int dispatch_block_plugin(oconfig_item_t *ci);
/*
* Private variables
*/
/*
* Private variables
*/
-static cf_callback_t *first_callback
= NULL
;
-static cf_complex_callback_t *complex_callback_head
= NULL
;
+static cf_callback_t *first_callback;
+static cf_complex_callback_t *complex_callback_head;
static cf_value_map_t cf_value_map[] = {{"TypesDB", dispatch_value_typesdb},
{"PluginDir", dispatch_value_plugindir},
static cf_value_map_t cf_value_map[] = {{"TypesDB", dispatch_value_typesdb},
{"PluginDir", dispatch_value_plugindir},
@@
-245,7
+245,7
@@
static int dispatch_value_plugindir(oconfig_item_t *ci) {
static int dispatch_loadplugin(oconfig_item_t *ci) {
const char *name;
static int dispatch_loadplugin(oconfig_item_t *ci) {
const char *name;
-
_Bool global = 0
;
+
bool global = false
;
plugin_ctx_t ctx = {0};
plugin_ctx_t old_ctx;
int ret_val;
plugin_ctx_t ctx = {0};
plugin_ctx_t old_ctx;
int ret_val;
@@
-372,7
+372,7
@@
static int dispatch_block_plugin(oconfig_item_t *ci) {
ctx.interval = cf_get_default_interval();
old_ctx = plugin_set_ctx(ctx);
ctx.interval = cf_get_default_interval();
old_ctx = plugin_set_ctx(ctx);
- status = plugin_load(name, /* flags = */
0
);
+ status = plugin_load(name, /* flags = */
false
);
/* reset to the "global" context */
plugin_set_ctx(old_ctx);
/* reset to the "global" context */
plugin_set_ctx(old_ctx);
@@
-461,9
+461,9
@@
static int cf_ci_replace_child(oconfig_item_t *dst, oconfig_item_t *src,
return 0;
}
return 0;
}
- temp =
-
realloc(dst->children,
sizeof(oconfig_item_t) *
-
(dst->children_num + src->children_num - 1));
+ temp =
realloc(dst->children,
+
sizeof(oconfig_item_t) *
+ (dst->children_num + src->children_num - 1));
if (temp == NULL) {
ERROR("configfile: realloc failed.");
return -1;
if (temp == NULL) {
ERROR("configfile: realloc failed.");
return -1;
@@
-502,8
+502,9
@@
static int cf_ci_append_children(oconfig_item_t *dst, oconfig_item_t *src) {
if ((src == NULL) || (src->children_num == 0))
return 0;
if ((src == NULL) || (src->children_num == 0))
return 0;
- temp = realloc(dst->children, sizeof(oconfig_item_t) *
- (dst->children_num + src->children_num));
+ temp =
+ realloc(dst->children,
+ sizeof(oconfig_item_t) * (dst->children_num + src->children_num));
if (temp == NULL) {
ERROR("configfile: realloc failed.");
return -1;
if (temp == NULL) {
ERROR("configfile: realloc failed.");
return -1;
@@
-633,9
+634,7
@@
static oconfig_item_t *cf_read_dir(const char *dir, const char *pattern,
dh = opendir(dir);
if (dh == NULL) {
dh = opendir(dir);
if (dh == NULL) {
- char errbuf[1024];
- ERROR("configfile: opendir failed: %s",
- sstrerror(errno, errbuf, sizeof(errbuf)));
+ ERROR("configfile: opendir failed: %s", STRERRNO);
return NULL;
}
return NULL;
}
@@
-764,9
+763,7
@@
static oconfig_item_t *cf_read_generic(const char *path, const char *pattern,
status = stat(path_ptr, &statbuf);
if (status != 0) {
status = stat(path_ptr, &statbuf);
if (status != 0) {
- char errbuf[1024];
- WARNING("configfile: stat (%s) failed: %s", path_ptr,
- sstrerror(errno, errbuf, sizeof(errbuf)));
+ WARNING("configfile: stat (%s) failed: %s", path_ptr, STRERRNO);
continue;
}
continue;
}
@@
-812,9
+809,7
@@
static oconfig_item_t *cf_read_generic(const char *path, const char *pattern,
status = stat(path, &statbuf);
if (status != 0) {
status = stat(path, &statbuf);
if (status != 0) {
- char errbuf[1024];
- ERROR("configfile: stat (%s) failed: %s", path,
- sstrerror(errno, errbuf, sizeof(errbuf)));
+ ERROR("configfile: stat (%s) failed: %s", path, STRERRNO);
return NULL;
}
return NULL;
}
@@
-831,7
+826,7
@@
static oconfig_item_t *cf_read_generic(const char *path, const char *pattern,
/*
* Public functions
*/
/*
* Public functions
*/
-int global_option_set(const char *option, const char *value,
_B
ool from_cli) {
+int global_option_set(const char *option, const char *value,
b
ool from_cli) {
int i;
DEBUG("option = %s; value = %s;", option, value);
int i;
DEBUG("option = %s; value = %s;", option, value);
@@
-874,7
+869,8
@@
const char *global_option_get(const char *option) {
return NULL;
}
return NULL;
}
- return (cf_global_options[i].value != NULL) ? cf_global_options[i].value : cf_global_options[i].def;
+ return (cf_global_options[i].value != NULL) ? cf_global_options[i].value
+ : cf_global_options[i].def;
} /* char *global_option_get */
long global_option_get_long(const char *option, long default_value) {
} /* char *global_option_get */
long global_option_get_long(const char *option, long default_value) {
@@
-1031,6
+1027,7
@@
int cf_read(const char *filename) {
}
return ret;
}
return ret;
+
} /* int cf_read */
/* Assures the config option is a string, duplicates it and returns the copy in
} /* int cf_read */
/* Assures the config option is a string, duplicates it and returns the copy in
@@
-1113,7
+1110,7
@@
int cf_util_get_double(const oconfig_item_t *ci, double *ret_value) /* {{{ */
return 0;
} /* }}} int cf_util_get_double */
return 0;
} /* }}} int cf_util_get_double */
-int cf_util_get_boolean(const oconfig_item_t *ci,
_B
ool *ret_bool) /* {{{ */
+int cf_util_get_boolean(const oconfig_item_t *ci,
b
ool *ret_bool) /* {{{ */
{
if ((ci == NULL) || (ret_bool == NULL))
return EINVAL;
{
if ((ci == NULL) || (ret_bool == NULL))
return EINVAL;
@@
-1128,7
+1125,7
@@
int cf_util_get_boolean(const oconfig_item_t *ci, _Bool *ret_bool) /* {{{ */
switch (ci->values[0].type) {
case OCONFIG_TYPE_BOOLEAN:
switch (ci->values[0].type) {
case OCONFIG_TYPE_BOOLEAN:
- *ret_bool = ci->values[0].value.boolean ?
1 : 0
;
+ *ret_bool = ci->values[0].value.boolean ?
true : false
;
break;
case OCONFIG_TYPE_STRING:
WARNING("cf_util_get_boolean: Using string value `%s' for boolean option "
break;
case OCONFIG_TYPE_STRING:
WARNING("cf_util_get_boolean: Using string value `%s' for boolean option "
@@
-1137,9
+1134,9
@@
int cf_util_get_boolean(const oconfig_item_t *ci, _Bool *ret_bool) /* {{{ */
ci->values[0].value.string, ci->key);
if (IS_TRUE(ci->values[0].value.string))
ci->values[0].value.string, ci->key);
if (IS_TRUE(ci->values[0].value.string))
- *ret_bool =
1
;
+ *ret_bool =
true
;
else if (IS_FALSE(ci->values[0].value.string))
else if (IS_FALSE(ci->values[0].value.string))
- *ret_bool =
0
;
+ *ret_bool =
false
;
else {
ERROR("cf_util_get_boolean: Cannot parse string value `%s' of the `%s' "
"option as a boolean value.",
else {
ERROR("cf_util_get_boolean: Cannot parse string value `%s' of the `%s' "
"option as a boolean value.",
@@
-1155,12
+1152,11
@@
int cf_util_get_boolean(const oconfig_item_t *ci, _Bool *ret_bool) /* {{{ */
int cf_util_get_flag(const oconfig_item_t *ci, /* {{{ */
unsigned int *ret_value, unsigned int flag) {
int status;
int cf_util_get_flag(const oconfig_item_t *ci, /* {{{ */
unsigned int *ret_value, unsigned int flag) {
int status;
- _Bool b;
if (ret_value == NULL)
return EINVAL;
if (ret_value == NULL)
return EINVAL;
- b
= 0
;
+ b
ool b = false
;
status = cf_util_get_boolean(ci, &b);
if (status != 0)
return status;
status = cf_util_get_boolean(ci, &b);
if (status != 0)
return status;