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 #2045 from rubenk/fix-readme
[collectd.git]
/
src
/
daemon
/
configfile.c
diff --git
a/src/daemon/configfile.c
b/src/daemon/configfile.c
index
83e44b7
..
e61128e
100644
(file)
--- a/
src/daemon/configfile.c
+++ b/
src/daemon/configfile.c
@@
-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;
}