X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Futils_mount.c;h=b63a81ad29b44fe13c113ca8843a7abb701bcfbf;hb=cf33da9ad00ac94931a2c87563f8d007a996f1ad;hp=efaa92f7faa8b5c78d5c9ea2084af9a0c95faf1a;hpb=09c6d16ffba1b1b15e50579bbcf663f05f630932;p=collectd.git

diff --git a/src/utils_mount.c b/src/utils_mount.c
index efaa92f7..b63a81ad 100644
--- a/src/utils_mount.c
+++ b/src/utils_mount.c
@@ -21,20 +21,18 @@
  *   Niki W. Waibel <niki.waibel@gmx.net>
 **/
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "collectd.h"
+#include "utils_mount.h"
+
+#include "common.h" /* sstrncpy() et alii */
+#include "plugin.h" /* ERROR() macro */
 
-#include "common.h"
 #if HAVE_XFS_XQM_H
 # include <xfs/xqm.h>
 #define XFS_SUPER_MAGIC_STR "XFSB"
 #define XFS_SUPER_MAGIC2_STR "BSFX"
 #endif
 
-#include "plugin.h"
-#include "utils_mount.h"
-
 #if HAVE_GETVFSSTAT
 #  if HAVE_SYS_TYPES_H
 #    include <sys/types.h>
@@ -260,7 +258,7 @@ uuidcache_init(void)
 			* (This is useful, if the cdrom on /dev/hdc must not
 			* be accessed.)
 			*/
-				snprintf(device, sizeof(device), "%s/%s",
+				ssnprintf(device, sizeof(device), "%s/%s",
 					DEVLABELDIR, ptname);
 				if(!get_label_uuid(device, &label, uuid)) {
 					uuidcache_addentry(sstrdup(device),
@@ -383,9 +381,11 @@ static cu_mount_t *cu_mount_listmntent (void)
 
 	struct tabmntent *mntlist;
 	if(listmntent(&mntlist, COLLECTD_MNTTAB, NULL, NULL) < 0) {
+#if COLLECT_DEBUG
 		char errbuf[1024];
 		DEBUG("utils_mount: calling listmntent() failed: %s",
 				sstrerror (errno, errbuf, sizeof (errbuf)));
+#endif /* COLLECT_DEBUG */
 	}
 
 	for(p = mntlist; p; p = p->next) {
@@ -454,9 +454,11 @@ static cu_mount_t *cu_mount_getfsstat (void)
 	/* Get the number of mounted file systems */
 	if ((bufsize = CMD_STATFS (NULL, 0, FLAGS_STATFS)) < 1)
 	{
+#if COLLECT_DEBUG
 		char errbuf[1024];
 		DEBUG ("utils_mount: getv?fsstat failed: %s",
 				sstrerror (errno, errbuf, sizeof (errbuf)));
+#endif /* COLLECT_DEBUG */
 		return (NULL);
 	}
 
@@ -469,9 +471,11 @@ static cu_mount_t *cu_mount_getfsstat (void)
 	 * manpage.. -octo */
 	if ((num = CMD_STATFS (buf, bufsize * sizeof (STRUCT_STATFS), FLAGS_STATFS)) < 1)
 	{
+#if COLLECT_DEBUG
 		char errbuf[1024];
 		DEBUG ("utils_mount: getv?fsstat failed: %s",
 				sstrerror (errno, errbuf, sizeof (errbuf)));
+#endif /* COLLECT_DEBUG */
 		free (buf);
 		return (NULL);
 	}
@@ -653,11 +657,11 @@ cu_mount_t *cu_mount_getlist(cu_mount_t **list)
 #elif HAVE_TWO_GETMNTENT || HAVE_GEN_GETMNTENT || HAVE_SUN_GETMNTENT
 	new = cu_mount_gen_getmntent ();
 #elif HAVE_SEQ_GETMNTENT
-# warn "This version of `getmntent' hat not yet been implemented!"
+# error "This version of `getmntent' hat not yet been implemented!"
 #elif HAVE_ONE_GETMNTENT
 	new = cu_mount_getmntent ();
 #else
-	new = NULL;
+# error "Could not determine how to find mountpoints."
 #endif
 
 	if (first != NULL)
@@ -746,9 +750,6 @@ cu_mount_getoptionvalue(char *line, char *keyword)
 		r += strlen(keyword);
 		p = strchr(r, ',');
 		if(p == NULL) {
-			if(strlen(r) == 0) {
-				return NULL;
-			}
 			return sstrdup(r);
 		} else {
 			char *m;
@@ -763,8 +764,6 @@ cu_mount_getoptionvalue(char *line, char *keyword)
 	return r;
 } /* char *cu_mount_getoptionvalue(char *line, char *keyword) */
 
-
-
 int
 cu_mount_type(const char *type)
 {
@@ -776,5 +775,3 @@ cu_mount_type(const char *type)
 	return CUMT_UNKNOWN;
 } /* int cu_mount_type(const char *type) */
 
-
-