projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tree wide: Replace sstrerror() with STRERRNO.
[collectd.git]
/
src
/
daemon
/
plugin.c
diff --git
a/src/daemon/plugin.c
b/src/daemon/plugin.c
index
ae99d5f
..
92b3629
100644
(file)
--- a/
src/daemon/plugin.c
+++ b/
src/daemon/plugin.c
@@
-1009,9
+1009,7
@@
int plugin_load(char const *plugin_name, _Bool global) {
}
if ((dh = opendir(dir)) == NULL) {
}
if ((dh = opendir(dir)) == NULL) {
- char errbuf[1024];
- ERROR("plugin_load: opendir (%s) failed: %s", dir,
- sstrerror(errno, errbuf, sizeof(errbuf)));
+ ERROR("plugin_load: opendir (%s) failed: %s", dir, STRERRNO);
return -1;
}
return -1;
}
@@
-1026,9
+1024,7
@@
int plugin_load(char const *plugin_name, _Bool global) {
}
if (lstat(filename, &statbuf) == -1) {
}
if (lstat(filename, &statbuf) == -1) {
- char errbuf[1024];
- WARNING("plugin_load: stat (\"%s\") failed: %s", filename,
- sstrerror(errno, errbuf, sizeof(errbuf)));
+ WARNING("plugin_load: stat (\"%s\") failed: %s", filename, STRERRNO);
continue;
} else if (!S_ISREG(statbuf.st_mode)) {
/* don't follow symlinks */
continue;
} else if (!S_ISREG(statbuf.st_mode)) {
/* don't follow symlinks */
@@
-1322,8
+1318,7
@@
int plugin_register_missing(const char *name, plugin_missing_cb callback,
} /* int plugin_register_missing */
int plugin_register_shutdown(const char *name, int (*callback)(void)) {
} /* int plugin_register_missing */
int plugin_register_shutdown(const char *name, int (*callback)(void)) {
- return create_register_callback(&list_shutdown, name, (void *)callback,
- NULL);
+ return create_register_callback(&list_shutdown, name, (void *)callback, NULL);
} /* int plugin_register_shutdown */
static void plugin_free_data_sets(void) {
} /* int plugin_register_shutdown */
static void plugin_free_data_sets(void) {
@@
-1874,23
+1869,16
@@
int plugin_shutdown_all(void) {
int plugin_dispatch_missing(const value_list_t *vl) /* {{{ */
{
int plugin_dispatch_missing(const value_list_t *vl) /* {{{ */
{
- llentry_t *le;
-
if (list_missing == NULL)
return 0;
if (list_missing == NULL)
return 0;
- le = llist_head(list_missing);
+ l
lentry_t *l
e = llist_head(list_missing);
while (le != NULL) {
while (le != NULL) {
- callback_func_t *cf;
- plugin_missing_cb callback;
- plugin_ctx_t old_ctx;
- int status;
+ callback_func_t *cf = le->value;
+ plugin_ctx_t old_ctx = plugin_set_ctx(cf->cf_ctx);
+ plugin_missing_cb callback = cf->cf_callback;
- cf = le->value;
- old_ctx = plugin_set_ctx(cf->cf_ctx);
- callback = cf->cf_callback;
-
- status = (*callback)(vl, &cf->cf_udata);
+ int status = (*callback)(vl, &cf->cf_udata);
plugin_set_ctx(old_ctx);
if (status != 0) {
if (status < 0) {
plugin_set_ctx(old_ctx);
if (status != 0) {
if (status < 0) {
@@
-1912,8
+1900,6
@@
static int plugin_dispatch_values_internal(value_list_t *vl) {
int status;
static c_complain_t no_write_complaint = C_COMPLAIN_INIT_STATIC;
int status;
static c_complain_t no_write_complaint = C_COMPLAIN_INIT_STATIC;
- data_set_t *ds;
-
_Bool free_meta_data = 0;
assert(vl != NULL);
_Bool free_meta_data = 0;
assert(vl != NULL);
@@
-1949,6
+1935,7
@@
static int plugin_dispatch_values_internal(value_list_t *vl) {
return -1;
}
return -1;
}
+ data_set_t *ds = NULL;
if (c_avl_get(data_sets, vl->type, (void *)&ds) != 0) {
char ident[6 * DATA_MAX_NAME_LEN];
if (c_avl_get(data_sets, vl->type, (void *)&ds) != 0) {
char ident[6 * DATA_MAX_NAME_LEN];
@@
-2471,9
+2458,7
@@
static plugin_ctx_t *plugin_ctx_create(void) {
ctx = malloc(sizeof(*ctx));
if (ctx == NULL) {
ctx = malloc(sizeof(*ctx));
if (ctx == NULL) {
- char errbuf[1024];
- ERROR("Failed to allocate plugin context: %s",
- sstrerror(errno, errbuf, sizeof(errbuf)));
+ ERROR("Failed to allocate plugin context: %s", STRERRNO);
return NULL;
}
return NULL;
}