projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-4.10' into collectd-5.0
[collectd.git]
/
src
/
df.c
diff --git
a/src/df.c
b/src/df.c
index
a96b79e
..
5391f50
100644
(file)
--- a/
src/df.c
+++ b/
src/df.c
@@
-33,12
+33,14
@@
# include <sys/statvfs.h>
# endif
# define STATANYFS statvfs
# include <sys/statvfs.h>
# endif
# define STATANYFS statvfs
+# define STATANYFS_STR "statvfs"
# define BLOCKSIZE(s) ((s).f_frsize ? (s).f_frsize : (s).f_bsize)
#elif HAVE_STATFS
# if HAVE_SYS_STATFS_H
# include <sys/statfs.h>
# endif
# define STATANYFS statfs
# define BLOCKSIZE(s) ((s).f_frsize ? (s).f_frsize : (s).f_bsize)
#elif HAVE_STATFS
# if HAVE_SYS_STATFS_H
# include <sys/statfs.h>
# endif
# define STATANYFS statfs
+# define STATANYFS_STR "statfs"
# define BLOCKSIZE(s) (s).f_bsize
#else
# error "No applicable input method."
# define BLOCKSIZE(s) (s).f_bsize
#else
# error "No applicable input method."
@@
-60,8
+62,8
@@
static ignorelist_t *il_device = NULL;
static ignorelist_t *il_mountpoint = NULL;
static ignorelist_t *il_fstype = NULL;
static ignorelist_t *il_mountpoint = NULL;
static ignorelist_t *il_fstype = NULL;
-static _Bool by_device =
false
;
-static _Bool report_inodes =
false
;
+static _Bool by_device =
0
;
+static _Bool report_inodes =
0
;
static int df_init (void)
{
static int df_init (void)
{
@@
-116,16
+118,16
@@
static int df_config (const char *key, const char *value)
else if (strcasecmp (key, "ReportByDevice") == 0)
{
if (IS_TRUE (value))
else if (strcasecmp (key, "ReportByDevice") == 0)
{
if (IS_TRUE (value))
- by_device =
true
;
+ by_device =
1
;
return (0);
}
else if (strcasecmp (key, "ReportInodes") == 0)
{
if (IS_TRUE (value))
return (0);
}
else if (strcasecmp (key, "ReportInodes") == 0)
{
if (IS_TRUE (value))
- report_inodes =
true
;
+ report_inodes =
1
;
else
else
- report_inodes =
false
;
+ report_inodes =
0
;
return (0);
}
return (0);
}
@@
-172,7
+174,10
@@
static int df_read (void)
mnt_list = NULL;
if (cu_mount_getlist (&mnt_list) == NULL)
mnt_list = NULL;
if (cu_mount_getlist (&mnt_list) == NULL)
+ {
+ ERROR ("df plugin: cu_mount_getlist failed.");
return (-1);
return (-1);
+ }
for (mnt_ptr = mnt_list; mnt_ptr != NULL; mnt_ptr = mnt_ptr->next)
{
for (mnt_ptr = mnt_list; mnt_ptr != NULL; mnt_ptr = mnt_ptr->next)
{
@@
-195,7
+200,8
@@
static int df_read (void)
if (STATANYFS (mnt_ptr->dir, &statbuf) < 0)
{
char errbuf[1024];
if (STATANYFS (mnt_ptr->dir, &statbuf) < 0)
{
char errbuf[1024];
- ERROR ("statv?fs failed: %s",
+ ERROR (STATANYFS_STR"(%s) failed: %s",
+ mnt_ptr->dir,
sstrerror (errno, errbuf,
sizeof (errbuf)));
continue;
sstrerror (errno, errbuf,
sizeof (errbuf)));
continue;