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 #1807 from matteocontrini/master
[collectd.git]
/
src
/
utils_mount.c
diff --git
a/src/utils_mount.c
b/src/utils_mount.c
index
03f41ad
..
a36882c
100644
(file)
--- a/
src/utils_mount.c
+++ b/
src/utils_mount.c
@@
-20,18
+20,24
@@
* Niki W. Waibel <niki.waibel@gmx.net>
**/
* Niki W. Waibel <niki.waibel@gmx.net>
**/
-#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
#if HAVE_XFS_XQM_H
+# define _GNU_SOURCE
# include <xfs/xqm.h>
#define XFS_SUPER_MAGIC_STR "XFSB"
#define XFS_SUPER_MAGIC2_STR "BSFX"
#endif
# include <xfs/xqm.h>
#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 <sys/types.h>
#if HAVE_GETVFSSTAT
# if HAVE_SYS_TYPES_H
# include <sys/types.h>
@@
-429,16
+435,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;
@@
-461,10
+467,8
@@
static cu_mount_t *cu_mount_getfsstat (void)
return (NULL);
}
return (NULL);
}
- if ((buf = (STRUCT_STATFS *) malloc (bufsize * sizeof (STRUCT_STATFS)))
- == NULL)
+ if ((buf = calloc (bufsize, sizeof (*buf))) == NULL)
return (NULL);
return (NULL);
- memset (buf, '\0', bufsize * sizeof (STRUCT_STATFS));
/* The bufsize needs to be passed in bytes. Really. This is not in the
* manpage.. -octo */
/* The bufsize needs to be passed in bytes. Really. This is not in the
* manpage.. -octo */
@@
-481,10
+485,9
@@
static cu_mount_t *cu_mount_getfsstat (void)
for (i = 0; i < num; i++)
{
for (i = 0; i < num; i++)
{
- if ((new =
malloc (sizeof (cu_mount_t
))) == NULL)
+ if ((new =
calloc (1, sizeof (*new
))) == NULL)
break;
break;
- memset (new, '\0', sizeof (cu_mount_t));
-
+
/* Copy values from `struct mnttab' */
new->dir = sstrdup (buf[i].f_mntonname);
new->spec_device = sstrdup (buf[i].f_mntfromname);
/* Copy values from `struct mnttab' */
new->dir = sstrdup (buf[i].f_mntonname);
new->spec_device = sstrdup (buf[i].f_mntfromname);
@@
-535,10
+538,9
@@
static cu_mount_t *cu_mount_gen_getmntent (void)
while (getmntent (fp, &mt) == 0)
{
while (getmntent (fp, &mt) == 0)
{
- if ((new =
malloc (sizeof (cu_mount_t
))) == NULL)
+ if ((new =
calloc (1, sizeof (*new
))) == NULL)
break;
break;
- memset (new, '\0', sizeof (cu_mount_t));
-
+
/* Copy values from `struct mnttab' */
new->dir = sstrdup (mt.mnt_mountp);
new->spec_device = sstrdup (mt.mnt_special);
/* Copy values from `struct mnttab' */
new->dir = sstrdup (mt.mnt_mountp);
new->spec_device = sstrdup (mt.mnt_special);
@@
-593,9
+595,8
@@
static cu_mount_t *cu_mount_getmntent (void)
while (getmntent_r (fp, &me, mntbuf, sizeof (mntbuf) ))
{
while (getmntent_r (fp, &me, mntbuf, sizeof (mntbuf) ))
{
- if ((new =
malloc (sizeof (cu_mount_t
))) == NULL)
+ if ((new =
calloc (1, sizeof (*new
))) == NULL)
break;
break;
- memset (new, '\0', sizeof (cu_mount_t));
/* Copy values from `struct mntent *' */
new->dir = sstrdup (me.mnt_dir);
/* Copy values from `struct mntent *' */
new->dir = sstrdup (me.mnt_dir);
@@
-650,10
+651,9
@@
static cu_mount_t *cu_mount_getmntent (void)
while ((me = getmntent (fp)) != NULL)
{
while ((me = getmntent (fp)) != NULL)
{
- if ((new =
malloc (sizeof (cu_mount_t
))) == NULL)
+ if ((new =
calloc (1, sizeof (*new
))) == NULL)
break;
break;
- memset (new, '\0', sizeof (cu_mount_t));
-
+
/* Copy values from `struct mntent *' */
new->dir = sstrdup (me->mnt_dir);
new->spec_device = sstrdup (me->mnt_fsname);
/* Copy values from `struct mntent *' */
new->dir = sstrdup (me->mnt_dir);
new->spec_device = sstrdup (me->mnt_fsname);
@@
-814,7
+814,7
@@
cu_mount_getoptionvalue(char *line, const char *keyword)
if((p-r) == 1) {
return NULL;
}
if((p-r) == 1) {
return NULL;
}
- m =
(char *)
smalloc(p-r+1);
+ m = smalloc(p-r+1);
sstrncpy(m, r, p-r+1);
return m;
}
sstrncpy(m, r, p-r+1);
return m;
}