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 #3152 from rpv-tomsk/libvirt-memory-report
[collectd.git]
/
src
/
df.c
diff --git
a/src/df.c
b/src/df.c
index
e3aa453
..
5b3fbd2
100644
(file)
--- a/
src/df.c
+++ b/
src/df.c
@@
-23,10
+23,10
@@
#include "collectd.h"
#include "collectd.h"
-#include "common.h"
#include "plugin.h"
#include "plugin.h"
-#include "utils_ignorelist.h"
-#include "utils_mount.h"
+#include "utils/common/common.h"
+#include "utils/ignorelist/ignorelist.h"
+#include "utils/mount/mount.h"
#if HAVE_STATVFS
#if HAVE_SYS_STATVFS_H
#if HAVE_STATVFS
#if HAVE_SYS_STATVFS_H
@@
-225,12
+225,10
@@
static int df_read(void) {
if (strcmp(mnt_ptr->dir, "/") == 0)
sstrncpy(disk_name, "root", sizeof(disk_name));
else {
if (strcmp(mnt_ptr->dir, "/") == 0)
sstrncpy(disk_name, "root", sizeof(disk_name));
else {
- int len;
-
sstrncpy(disk_name, mnt_ptr->dir + 1, sizeof(disk_name));
sstrncpy(disk_name, mnt_ptr->dir + 1, sizeof(disk_name));
- len = strlen(disk_name);
+
size_t
len = strlen(disk_name);
- for (
in
t i = 0; i < len; i++)
+ for (
size_
t i = 0; i < len; i++)
if (disk_name[i] == '/')
disk_name[i] = '-';
}
if (disk_name[i] == '/')
disk_name[i] = '-';
}