projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/collectd-5.8'
[collectd.git]
/
src
/
daemon
/
common.c
diff --git
a/src/daemon/common.c
b/src/daemon/common.c
index
28c9798
..
fbbb608
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
@@
-212,7
+216,7
@@
void sfree (void **ptr)
}
#endif
}
#endif
-
ssize_
t sread(int fd, void *buf, size_t count) {
+
in
t sread(int fd, void *buf, size_t count) {
char *ptr;
size_t nleft;
ssize_t status;
char *ptr;
size_t nleft;
ssize_t status;
@@
-243,7
+247,7
@@
ssize_t sread(int fd, void *buf, size_t count) {
return 0;
}
return 0;
}
-
ssize_
t swrite(int fd, const void *buf, size_t count) {
+
in
t swrite(int fd, const void *buf, size_t count) {
const char *ptr;
size_t nleft;
ssize_t status;
const char *ptr;
size_t nleft;
ssize_t status;
@@
-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)) {
@@
-893,7
+893,7
@@
int format_values(char *ret, size_t ret_len, /* {{{ */
}
BUFFER_ADD(":" GAUGE_FORMAT, rates[i]);
} else if (ds->ds[i].type == DS_TYPE_COUNTER)
}
BUFFER_ADD(":" GAUGE_FORMAT, rates[i]);
} else if (ds->ds[i].type == DS_TYPE_COUNTER)
- BUFFER_ADD(":%
llu",
vl->values[i].counter);
+ BUFFER_ADD(":%
" PRIu64, (uint64_t)
vl->values[i].counter);
else if (ds->ds[i].type == DS_TYPE_DERIVE)
BUFFER_ADD(":%" PRIi64, vl->values[i].derive);
else if (ds->ds[i].type == DS_TYPE_ABSOLUTE)
else if (ds->ds[i].type == DS_TYPE_DERIVE)
BUFFER_ADD(":%" PRIi64, vl->values[i].derive);
else if (ds->ds[i].type == DS_TYPE_ABSOLUTE)
@@
-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;
}