projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
amqp1: Fix leaks on error paths
[collectd.git]
/
src
/
disk.c
diff --git
a/src/disk.c
b/src/disk.c
index
84bc3f5
..
c02b6ab
100644
(file)
--- a/
src/disk.c
+++ b/
src/disk.c
@@
-59,9
+59,6
@@
#include <libgeom.h>
#endif
#include <libgeom.h>
#endif
-#if HAVE_LIMITS_H
-#include <limits.h>
-#endif
#ifndef UINT_MAX
#define UINT_MAX 4294967295U
#endif
#ifndef UINT_MAX
#define UINT_MAX 4294967295U
#endif
@@
-209,7
+206,7
@@
static int disk_init(void) {
io_master_port = MACH_PORT_NULL;
return -1;
}
io_master_port = MACH_PORT_NULL;
return -1;
}
- /* #endif HAVE_IOKIT_IOKITLIB_H */
+
/* #endif HAVE_IOKIT_IOKITLIB_H */
#elif KERNEL_LINUX
#if HAVE_LIBUDEV_H
#elif KERNEL_LINUX
#if HAVE_LIBUDEV_H
@@
-221,7
+218,7
@@
static int disk_init(void) {
}
}
#endif /* HAVE_LIBUDEV_H */
}
}
#endif /* HAVE_LIBUDEV_H */
- /* #endif KERNEL_LINUX */
+
/* #endif KERNEL_LINUX */
#elif KERNEL_FREEBSD
int rv;
#elif KERNEL_FREEBSD
int rv;
@@
-236,7
+233,7
@@
static int disk_init(void) {
ERROR("geom_stats_open() failed, returned %d", rv);
return -1;
}
ERROR("geom_stats_open() failed, returned %d", rv);
return -1;
}
- /* #endif KERNEL_FREEBSD */
+
/* #endif KERNEL_FREEBSD */
#elif HAVE_LIBKSTAT
kstat_t *ksp_chain;
#elif HAVE_LIBKSTAT
kstat_t *ksp_chain;
@@
-947,7
+944,7
@@
static int disk_read(void) {
disk_submit(ksp[i]->ks_name, "disk_ops", kio.KIO_ROPS, kio.KIO_WOPS);
}
}
disk_submit(ksp[i]->ks_name, "disk_ops", kio.KIO_ROPS, kio.KIO_WOPS);
}
}
- /* #endif defined(HAVE_LIBKSTAT) */
+
/* #endif defined(HAVE_LIBKSTAT) */
#elif defined(HAVE_LIBSTATGRAB)
sg_disk_io_stats *ds;
#elif defined(HAVE_LIBSTATGRAB)
sg_disk_io_stats *ds;
@@
-974,7
+971,7
@@
static int disk_read(void) {
disk_submit(name, "disk_octets", ds->read_bytes, ds->write_bytes);
ds++;
}
disk_submit(name, "disk_octets", ds->read_bytes, ds->write_bytes);
ds++;
}
- /* #endif defined(HAVE_LIBSTATGRAB) */
+
/* #endif defined(HAVE_LIBSTATGRAB) */
#elif defined(HAVE_PERFSTAT)
derive_t read_sectors;
#elif defined(HAVE_PERFSTAT)
derive_t read_sectors;