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-4.0' into collectd-4.1
[collectd.git]
/
src
/
utils_mount.c
diff --git
a/src/utils_mount.c
b/src/utils_mount.c
index
163bd63
..
67d2e33
100644
(file)
--- a/
src/utils_mount.c
+++ b/
src/utils_mount.c
@@
-32,7
+32,7
@@
#define XFS_SUPER_MAGIC2_STR "BSFX"
#endif
#define XFS_SUPER_MAGIC2_STR "BSFX"
#endif
-#include "
utils_debug
.h"
+#include "
plugin
.h"
#include "utils_mount.h"
#if HAVE_GETVFSSTAT
#include "utils_mount.h"
#if HAVE_GETVFSSTAT
@@
-334,7
+334,7
@@
get_spec_by_uuid(const char *s)
return get_spec_by_x(UUID, uuid);
bad_uuid:
return get_spec_by_x(UUID, uuid);
bad_uuid:
- D
B
G("Found an invalid UUID: %s", s);
+ D
EBU
G("Found an invalid UUID: %s", s);
return NULL;
}
return NULL;
}
@@
-353,12
+353,12
@@
static char *get_device_name(const char *optstr)
}
else if (strncmp (optstr, "UUID=", 5) == 0)
{
}
else if (strncmp (optstr, "UUID=", 5) == 0)
{
- D
B
G ("TODO: check UUID= code!");
+ D
EBU
G ("TODO: check UUID= code!");
rc = get_spec_by_uuid (optstr + 5);
}
else if (strncmp (optstr, "LABEL=", 6) == 0)
{
rc = get_spec_by_uuid (optstr + 5);
}
else if (strncmp (optstr, "LABEL=", 6) == 0)
{
- D
B
G ("TODO: check LABEL= code!");
+ D
EBU
G ("TODO: check LABEL= code!");
rc = get_spec_by_volume_label (optstr + 6);
}
else
rc = get_spec_by_volume_label (optstr + 6);
}
else
@@
-368,7
+368,7
@@
static char *get_device_name(const char *optstr)
if(!rc)
{
if(!rc)
{
- D
B
G ("Error checking device name: optstr = %s", optstr);
+ D
EBU
G ("Error checking device name: optstr = %s", optstr);
}
return rc;
}
}
return rc;
}
@@
-383,7
+383,9
@@
static cu_mount_t *cu_mount_listmntent (void)
struct tabmntent *mntlist;
if(listmntent(&mntlist, COLLECTD_MNTTAB, NULL, NULL) < 0) {
struct tabmntent *mntlist;
if(listmntent(&mntlist, COLLECTD_MNTTAB, NULL, NULL) < 0) {
- DBG("calling listmntent() failed: %s", strerror(errno));
+ char errbuf[1024];
+ DEBUG("calling listmntent() failed: %s",
+ sstrerror (errno, errbuf, sizeof (errbuf)));
}
for(p = mntlist; p; p = p->next) {
}
for(p = mntlist; p; p = p->next) {
@@
-394,7
+396,7
@@
static cu_mount_t *cu_mount_listmntent (void)
if(loop == NULL) { /* no loop= mount */
device = get_device_name(mnt->mnt_fsname);
if(device == NULL) {
if(loop == NULL) { /* no loop= mount */
device = get_device_name(mnt->mnt_fsname);
if(device == NULL) {
- D
B
G("can't get devicename for fs (%s) %s (%s)"
+ D
EBU
G("can't get devicename for fs (%s) %s (%s)"
": ignored", mnt->mnt_type,
mnt->mnt_dir, mnt->mnt_fsname);
continue;
": ignored", mnt->mnt_type,
mnt->mnt_dir, mnt->mnt_fsname);
continue;
@@
-452,7
+454,9
@@
static cu_mount_t *cu_mount_getfsstat (void)
/* Get the number of mounted file systems */
if ((bufsize = CMD_STATFS (NULL, 0, FLAGS_STATFS)) < 1)
{
/* Get the number of mounted file systems */
if ((bufsize = CMD_STATFS (NULL, 0, FLAGS_STATFS)) < 1)
{
- DBG ("getv?fsstat failed: %s", strerror (errno));
+ char errbuf[1024];
+ DEBUG ("getv?fsstat failed: %s",
+ sstrerror (errno, errbuf, sizeof (errbuf)));
return (NULL);
}
return (NULL);
}
@@
-465,7
+469,9
@@
static cu_mount_t *cu_mount_getfsstat (void)
* manpage.. -octo */
if ((num = CMD_STATFS (buf, bufsize * sizeof (STRUCT_STATFS), FLAGS_STATFS)) < 1)
{
* manpage.. -octo */
if ((num = CMD_STATFS (buf, bufsize * sizeof (STRUCT_STATFS), FLAGS_STATFS)) < 1)
{
- DBG ("getv?fsstat failed: %s", strerror (errno));
+ char errbuf[1024];
+ DEBUG ("getv?fsstat failed: %s",
+ sstrerror (errno, errbuf, sizeof (errbuf)));
free (buf);
return (NULL);
}
free (buf);
return (NULL);
}
@@
-514,11
+520,13
@@
static cu_mount_t *cu_mount_gen_getmntent (void)
cu_mount_t *last = NULL;
cu_mount_t *new = NULL;
cu_mount_t *last = NULL;
cu_mount_t *new = NULL;
- D
B
G ("(void); COLLECTD_MNTTAB = %s", COLLECTD_MNTTAB);
+ D
EBU
G ("(void); COLLECTD_MNTTAB = %s", COLLECTD_MNTTAB);
if ((fp = fopen (COLLECTD_MNTTAB, "r")) == NULL)
{
if ((fp = fopen (COLLECTD_MNTTAB, "r")) == NULL)
{
- syslog (LOG_ERR, "fopen (%s): %s", COLLECTD_MNTTAB, strerror (errno));
+ char errbuf[1024];
+ ERROR ("fopen (%s): %s", COLLECTD_MNTTAB,
+ sstrerror (errno, errbuf, sizeof (errbuf)));
return (NULL);
}
return (NULL);
}
@@
-569,11
+577,13
@@
static cu_mount_t *cu_mount_getmntent (void)
cu_mount_t *last = NULL;
cu_mount_t *new = NULL;
cu_mount_t *last = NULL;
cu_mount_t *new = NULL;
- D
B
G ("(void); COLLECTD_MNTTAB = %s", COLLECTD_MNTTAB);
+ D
EBU
G ("(void); COLLECTD_MNTTAB = %s", COLLECTD_MNTTAB);
if ((fp = setmntent (COLLECTD_MNTTAB, "r")) == NULL)
{
if ((fp = setmntent (COLLECTD_MNTTAB, "r")) == NULL)
{
- syslog (LOG_ERR, "setmntent (%s): %s", COLLECTD_MNTTAB, strerror (errno));
+ char errbuf[1024];
+ ERROR ("setmntent (%s): %s", COLLECTD_MNTTAB,
+ sstrerror (errno, errbuf, sizeof (errbuf)));
return (NULL);
}
return (NULL);
}
@@
-591,7
+601,7
@@
static cu_mount_t *cu_mount_getmntent (void)
new->device = get_device_name (new->options);
new->next = NULL;
new->device = get_device_name (new->options);
new->next = NULL;
- D
B
G ("new = {dir = %s, spec_device = %s, type = %s, options = %s, device = %s}",
+ D
EBU
G ("new = {dir = %s, spec_device = %s, type = %s, options = %s, device = %s}",
new->dir, new->spec_device, new->type, new->options, new->device);
/* Append to list */
new->dir, new->spec_device, new->type, new->options, new->device);
/* Append to list */
@@
-609,7
+619,7
@@
static cu_mount_t *cu_mount_getmntent (void)
endmntent (fp);
endmntent (fp);
- D
B
G ("return (0x%p)", (void *) first);
+ D
EBU
G ("return (0x%p)", (void *) first);
return (first);
}
return (first);
}
@@
-672,7
+682,7
@@
void cu_mount_freelist (cu_mount_t *list)
cu_mount_t *this;
cu_mount_t *next;
cu_mount_t *this;
cu_mount_t *next;
- D
B
G ("(list = 0x%p)", (void *) list);
+ D
EBU
G ("(list = 0x%p)", (void *) list);
for (this = list; this != NULL; this = next)
{
for (this = list; this != NULL; this = next)
{