projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
powerdns: Fix formatting, broken by clang-format
[collectd.git]
/
src
/
disk.c
diff --git
a/src/disk.c
b/src/disk.c
index
7edf44c
..
e73a5c0
100644
(file)
--- a/
src/disk.c
+++ b/
src/disk.c
@@
-23,9
+23,9
@@
#include "collectd.h"
#include "collectd.h"
-#include "common.h"
#include "plugin.h"
#include "plugin.h"
-#include "utils_ignorelist.h"
+#include "utils/common/common.h"
+#include "utils/ignorelist/ignorelist.h"
#if HAVE_MACH_MACH_TYPES_H
#include <mach/mach_types.h>
#if HAVE_MACH_MACH_TYPES_H
#include <mach/mach_types.h>
@@
-701,7
+701,7
@@
static int disk_read(void) {
break;
if (ds == NULL) {
break;
if (ds == NULL) {
- if ((ds =
(diskstats_t *)calloc(1, sizeof(diskstats_t
))) == NULL)
+ if ((ds =
calloc(1, sizeof(*ds
))) == NULL)
continue;
if ((ds->name = strdup(disk_name)) == NULL) {
continue;
if ((ds->name = strdup(disk_name)) == NULL) {
@@
-989,9
+989,8
@@
static int disk_read(void) {
}
if (numdisk != pnumdisk || stat_disk == NULL) {
}
if (numdisk != pnumdisk || stat_disk == NULL) {
- if (stat_disk != NULL)
- free(stat_disk);
- stat_disk = (perfstat_disk_t *)calloc(numdisk, sizeof(perfstat_disk_t));
+ free(stat_disk);
+ stat_disk = calloc(numdisk, sizeof(*stat_disk));
}
pnumdisk = numdisk;
}
pnumdisk = numdisk;