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 #2618 from ajssmith/amqp1_dev1_branch
[collectd.git]
/
src
/
daemon
/
common.c
diff --git
a/src/daemon/common.c
b/src/daemon/common.c
index
3ec56a1
..
582d6b2
100644
(file)
--- a/
src/daemon/common.c
+++ b/
src/daemon/common.c
@@
-60,6
+60,10
@@
#include <sys/capability.h>
#endif
#include <sys/capability.h>
#endif
+#if HAVE_KSTAT_H
+#include <kstat.h>
+#endif
+
#ifdef HAVE_LIBKSTAT
extern kstat_ctl_t *kc;
#endif
#ifdef HAVE_LIBKSTAT
extern kstat_ctl_t *kc;
#endif
@@
-629,14
+633,10
@@
int check_create_dir(const char *file_orig) {
if (EEXIST == errno)
continue;
if (EEXIST == errno)
continue;
- char errbuf[1024];
- ERROR("check_create_dir: mkdir (%s): %s", dir,
- sstrerror(errno, errbuf, sizeof(errbuf)));
+ ERROR("check_create_dir: mkdir (%s): %s", dir, STRERRNO);
return -1;
} else {
return -1;
} else {
- char errbuf[1024];
- ERROR("check_create_dir: stat (%s): %s", dir,
- sstrerror(errno, errbuf, sizeof(errbuf)));
+ ERROR("check_create_dir: stat (%s): %s", dir, STRERRNO);
return -1;
}
} else if (!S_ISDIR(statbuf.st_mode)) {
return -1;
}
} else if (!S_ISDIR(statbuf.st_mode)) {
@@
-857,7
+857,7
@@
int format_name(char *ret, int ret_len, const char *hostname,
int format_values(char *ret, size_t ret_len, /* {{{ */
const data_set_t *ds, const value_list_t *vl,
int format_values(char *ret, size_t ret_len, /* {{{ */
const data_set_t *ds, const value_list_t *vl,
-
_B
ool store_rates) {
+
b
ool store_rates) {
size_t offset = 0;
int status;
gauge_t *rates = NULL;
size_t offset = 0;
int status;
gauge_t *rates = NULL;
@@
-1210,9
+1210,7
@@
int walk_directory(const char *dir, dirwalk_callback_f callback,
failure = 0;
if ((dh = opendir(dir)) == NULL) {
failure = 0;
if ((dh = opendir(dir)) == NULL) {
- char errbuf[1024];
- ERROR("walk_directory: Cannot open '%s': %s", dir,
- sstrerror(errno, errbuf, sizeof(errbuf)));
+ ERROR("walk_directory: Cannot open '%s': %s", dir, STRERRNO);
return -1;
}
return -1;
}