X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Futils_mount.c;h=752d2e158a597e2b3b9e893d57c2d8267d1c71de;hb=43ef00c0eb99991902d3c9a5fbe582cde049b055;hp=4ec5fb79e8bcd8bbd8e4b68334309796004f2b19;hpb=d9db39b8e8b5e9a34d955d057574f6ddd00759e6;p=collectd.git diff --git a/src/utils_mount.c b/src/utils_mount.c index 4ec5fb79..752d2e15 100644 --- a/src/utils_mount.c +++ b/src/utils_mount.c @@ -20,18 +20,24 @@ * Niki W. Waibel **/ -#include "collectd.h" -#include "utils_mount.h" - -#include "common.h" /* sstrncpy() et alii */ -#include "plugin.h" /* ERROR() macro */ +#if HAVE_CONFIG_H +# include "config.h" +#endif #if HAVE_XFS_XQM_H +# define _GNU_SOURCE # include #define XFS_SUPER_MAGIC_STR "XFSB" #define XFS_SUPER_MAGIC2_STR "BSFX" #endif +#include "collectd.h" +#include "utils_mount.h" + +#include "common.h" /* sstrncpy() et alii */ +#include "plugin.h" /* ERROR() macro */ + + #if HAVE_GETVFSSTAT # if HAVE_SYS_TYPES_H # include @@ -757,7 +763,7 @@ void cu_mount_freelist (cu_mount_t *list) } /* void cu_mount_freelist(cu_mount_t *list) */ char * -cu_mount_checkoption(char *line, char *keyword, int full) +cu_mount_checkoption(char *line, const char *keyword, int full) { char *line2, *l2, *p1, *p2; int l; @@ -798,7 +804,7 @@ cu_mount_checkoption(char *line, char *keyword, int full) } /* char *cu_mount_checkoption(char *line, char *keyword, int full) */ char * -cu_mount_getoptionvalue(char *line, char *keyword) +cu_mount_getoptionvalue(char *line, const char *keyword) { char *r; @@ -820,7 +826,7 @@ cu_mount_getoptionvalue(char *line, char *keyword) } } return r; -} /* char *cu_mount_getoptionvalue(char *line, char *keyword) */ +} /* char *cu_mount_getoptionvalue(char *line, const char *keyword) */ int cu_mount_type(const char *type)