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-5.5'
[collectd.git]
/
src
/
utils_mount.c
diff --git
a/src/utils_mount.c
b/src/utils_mount.c
index
36d8d64
..
c329ba4
100644
(file)
--- a/
src/utils_mount.c
+++ b/
src/utils_mount.c
@@
-429,16
+429,16
@@
static cu_mount_t *cu_mount_listmntent (void)
#elif HAVE_GETVFSSTAT || HAVE_GETFSSTAT
static cu_mount_t *cu_mount_getfsstat (void)
{
#elif HAVE_GETVFSSTAT || HAVE_GETFSSTAT
static cu_mount_t *cu_mount_getfsstat (void)
{
-#if HAVE_GETVFSSTAT
-# define STRUCT_STATFS struct statvfs
-# define CMD_STATFS getvfsstat
-# define FLAGS_STATFS ST_NOWAIT
-/* #endif HAVE_GETVFSSTAT */
-#elif HAVE_GETFSSTAT
+#if HAVE_GETFSSTAT
# define STRUCT_STATFS struct statfs
# define CMD_STATFS getfsstat
# define FLAGS_STATFS MNT_NOWAIT
# define STRUCT_STATFS struct statfs
# define CMD_STATFS getfsstat
# define FLAGS_STATFS MNT_NOWAIT
-#endif /* HAVE_GETFSSTAT */
+/* #endif HAVE_GETFSSTAT */
+#elif HAVE_GETVFSSTAT
+# define STRUCT_STATFS struct statvfs
+# define CMD_STATFS getvfsstat
+# define FLAGS_STATFS ST_NOWAIT
+#endif /* HAVE_GETVFSSTAT */
int bufsize;
STRUCT_STATFS *buf;
int bufsize;
STRUCT_STATFS *buf;
@@
-757,7
+757,7
@@
void cu_mount_freelist (cu_mount_t *list)
} /* void cu_mount_freelist(cu_mount_t *list) */
char *
} /* void cu_mount_freelist(cu_mount_t *list) */
char *
-cu_mount_checkoption(char *line, char *keyword, int full)
+cu_mount_checkoption(char *line, c
onst c
har *keyword, int full)
{
char *line2, *l2, *p1, *p2;
int l;
{
char *line2, *l2, *p1, *p2;
int l;
@@
-798,7
+798,7
@@
cu_mount_checkoption(char *line, char *keyword, int full)
} /* char *cu_mount_checkoption(char *line, char *keyword, int full) */
char *
} /* char *cu_mount_checkoption(char *line, char *keyword, int full) */
char *
-cu_mount_getoptionvalue(char *line, char *keyword)
+cu_mount_getoptionvalue(char *line, c
onst c
har *keyword)
{
char *r;
{
char *r;
@@
-820,7
+820,7
@@
cu_mount_getoptionvalue(char *line, char *keyword)
}
}
return r;
}
}
return r;
-} /* char *cu_mount_getoptionvalue(char *line, char *keyword) */
+} /* char *cu_mount_getoptionvalue(char *line, c
onst c
har *keyword) */
int
cu_mount_type(const char *type)
int
cu_mount_type(const char *type)