From: Florian Forster <octo@collectd.org>
Date: Tue, 6 Sep 2016 06:42:26 +0000 (+0200)
Subject: Merge branch 'collectd-5.5' into collectd-5.6
X-Git-Tag: collectd-5.6.0~2
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=ed985cb9d3d89aec3490b17e0fda3ee97908f935;hp=-c

Merge branch 'collectd-5.5' into collectd-5.6
---

ed985cb9d3d89aec3490b17e0fda3ee97908f935
diff --combined src/utils_mount.c
index b8dabb17,37b52d68..e527c258
--- a/src/utils_mount.c
+++ b/src/utils_mount.c
@@@ -24,17 -24,17 +24,18 @@@
  # include "config.h"
  #endif
  
+ #define _GNU_SOURCE
+ 
+ #include "collectd.h"
++
+ #include "utils_mount.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 "collectd.h"
- 
- #include "utils_mount.h"
- 
  #include "common.h" /* sstrncpy() et alii */
  #include "plugin.h" /* ERROR() macro */
  
@@@ -216,6 -216,7 +217,6 @@@ uuidcache_init(void
  	FILE *procpt;
  	char uuid[16], *label = NULL;
  	char device[110];
 -	int firstPass;
  	int handleOnFirst;
  
  	if(uuidCache) {
@@@ -227,7 -228,7 +228,7 @@@
  		return;
  	}
  
 -	for(firstPass = 1; firstPass >= 0; firstPass--) {
 +	for(int firstPass = 1; firstPass >= 0; firstPass--) {
  		fseek(procpt, 0, SEEK_SET);
  		while(fgets(line, sizeof(line), procpt)) {
  			if(sscanf(line, " %d %d %d %[^\n ]",
@@@ -317,13 -318,14 +318,13 @@@ static char 
  get_spec_by_uuid(const char *s)
  {
  	char uuid[16];
 -	int i;
  
  	if(strlen(s) != 36
  	|| s[8] != '-' || s[13] != '-' || s[18] != '-' || s[23] != '-') {
  		goto bad_uuid;
  	}
  
 -	for(i=0; i<16; i++) {
 +	for(int i=0; i<16; i++) {
  		if(*s == '-') {
  			s++;
  		}
@@@ -380,6 -382,7 +381,6 @@@ static char *get_device_name(const cha
  static cu_mount_t *cu_mount_listmntent (void)
  {
  	cu_mount_t *last = *list;
 -	struct tabmntent *p;
  	struct mntent *mnt;
  
  	struct tabmntent *mntlist;
@@@ -391,7 -394,7 +392,7 @@@
  #endif /* COLLECT_DEBUG */
  	}
  
 -	for(p = mntlist; p; p = p->next) {
 +	for(struct tabmntent *p = mntlist; p; p = p->next) {
  		char *loop = NULL, *device = NULL;
  
  		mnt = p->ment;
@@@ -448,6 -451,7 +449,6 @@@ static cu_mount_t *cu_mount_getfsstat (
  	STRUCT_STATFS *buf;
  
  	int num;
 -	int i;
  
  	cu_mount_t *first = NULL;
  	cu_mount_t *last  = NULL;
@@@ -464,8 -468,10 +465,8 @@@
  		return (NULL);
  	}
  
 -	if ((buf = (STRUCT_STATFS *) malloc (bufsize * sizeof (STRUCT_STATFS)))
 -			== NULL)
 +	if ((buf = calloc (bufsize, sizeof (*buf))) == 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 */
@@@ -480,11 -486,12 +481,11 @@@
  		return (NULL);
  	}
  
 -	for (i = 0; i < num; i++)
 +	for (int i = 0; i < num; i++)
  	{
 -		if ((new = malloc (sizeof (cu_mount_t))) == NULL)
 +		if ((new = calloc (1, sizeof (*new))) == NULL)
  			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);
@@@ -535,9 -542,10 +536,9 @@@ static cu_mount_t *cu_mount_gen_getmnte
  
  	while (getmntent (fp, &mt) == 0)
  	{
 -		if ((new = malloc (sizeof (cu_mount_t))) == NULL)
 +		if ((new = calloc (1, sizeof (*new))) == NULL)
  			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);
@@@ -592,8 -600,9 +593,8 @@@ static cu_mount_t *cu_mount_getmntent (
  
  	while (getmntent_r (fp, &me, mntbuf, sizeof (mntbuf) ))
  	{
 -		if ((new = malloc (sizeof (cu_mount_t))) == NULL)
 +		if ((new = calloc (1, sizeof (*new))) == NULL)
  			break;
 -		memset (new, '\0', sizeof (cu_mount_t));
  
  		/* Copy values from `struct mntent *' */
  		new->dir         = sstrdup (me.mnt_dir);
@@@ -648,9 -657,10 +649,9 @@@ static cu_mount_t *cu_mount_getmntent (
  
  	while ((me = getmntent (fp)) != NULL)
  	{
 -		if ((new = malloc (sizeof (cu_mount_t))) == NULL)
 +		if ((new = calloc (1, sizeof (*new))) == NULL)
  			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);
@@@ -737,9 -747,10 +738,9 @@@ cu_mount_t *cu_mount_getlist(cu_mount_
  
  void cu_mount_freelist (cu_mount_t *list)
  {
 -	cu_mount_t *this;
  	cu_mount_t *next;
  
 -	for (this = list; this != NULL; this = next)
 +	for (cu_mount_t *this = list; this != NULL; this = next)
  	{
  		next = this->next;
  
@@@ -753,7 -764,7 +754,7 @@@
  } /* 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;
@@@ -794,7 -805,7 +795,7 @@@
  } /* 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;
  
@@@ -810,13 -821,13 +811,13 @@@
  			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;
  		}
  	}
  	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)