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 #396 from radford/perl-debug-compile-fix
[collectd.git]
/
src
/
utils_mount.c
diff --git
a/src/utils_mount.c
b/src/utils_mount.c
index
efaa92f
..
3cede01
100644
(file)
--- a/
src/utils_mount.c
+++ b/
src/utils_mount.c
@@
-260,7
+260,7
@@
uuidcache_init(void)
* (This is useful, if the cdrom on /dev/hdc must not
* be accessed.)
*/
* (This is useful, if the cdrom on /dev/hdc must not
* be accessed.)
*/
- snprintf(device, sizeof(device), "%s/%s",
+ s
s
nprintf(device, sizeof(device), "%s/%s",
DEVLABELDIR, ptname);
if(!get_label_uuid(device, &label, uuid)) {
uuidcache_addentry(sstrdup(device),
DEVLABELDIR, ptname);
if(!get_label_uuid(device, &label, uuid)) {
uuidcache_addentry(sstrdup(device),
@@
-383,9
+383,11
@@
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) {
+#if COLLECT_DEBUG
char errbuf[1024];
DEBUG("utils_mount: calling listmntent() failed: %s",
sstrerror (errno, errbuf, sizeof (errbuf)));
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) {
}
for(p = mntlist; p; p = p->next) {
@@
-454,9
+456,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)
{
/* 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)));
char errbuf[1024];
DEBUG ("utils_mount: getv?fsstat failed: %s",
sstrerror (errno, errbuf, sizeof (errbuf)));
+#endif /* COLLECT_DEBUG */
return (NULL);
}
return (NULL);
}
@@
-469,9
+473,11
@@
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)
{
+#if COLLECT_DEBUG
char errbuf[1024];
DEBUG ("utils_mount: getv?fsstat failed: %s",
sstrerror (errno, errbuf, sizeof (errbuf)));
char errbuf[1024];
DEBUG ("utils_mount: getv?fsstat failed: %s",
sstrerror (errno, errbuf, sizeof (errbuf)));
+#endif /* COLLECT_DEBUG */
free (buf);
return (NULL);
}
free (buf);
return (NULL);
}
@@
-653,11
+659,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
#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
#elif HAVE_ONE_GETMNTENT
new = cu_mount_getmntent ();
#else
- new = NULL;
+# error "Could not determine how to find mountpoints."
#endif
if (first != NULL)
#endif
if (first != NULL)
@@
-746,9
+752,6
@@
cu_mount_getoptionvalue(char *line, char *keyword)
r += strlen(keyword);
p = strchr(r, ',');
if(p == NULL) {
r += strlen(keyword);
p = strchr(r, ',');
if(p == NULL) {
- if(strlen(r) == 0) {
- return NULL;
- }
return sstrdup(r);
} else {
char *m;
return sstrdup(r);
} else {
char *m;
@@
-763,8
+766,6
@@
cu_mount_getoptionvalue(char *line, char *keyword)
return r;
} /* char *cu_mount_getoptionvalue(char *line, char *keyword) */
return r;
} /* char *cu_mount_getoptionvalue(char *line, char *keyword) */
-
-
int
cu_mount_type(const char *type)
{
int
cu_mount_type(const char *type)
{
@@
-776,5
+777,3
@@
cu_mount_type(const char *type)
return CUMT_UNKNOWN;
} /* int cu_mount_type(const char *type) */
return CUMT_UNKNOWN;
} /* int cu_mount_type(const char *type) */
-
-