X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdisk.c;h=962b7c30697b54f0c2117bff84fcde130fa565f7;hb=6e41c3b1f024d7944e5e8010a87933555c662474;hp=116fc244868cdafd3abbd334af37ddb68c308e15;hpb=c3c9a56e37bac5d5be3b6beb0b33f89ea941295e;p=collectd.git diff --git a/src/disk.c b/src/disk.c index 116fc244..962b7c30 100644 --- a/src/disk.c +++ b/src/disk.c @@ -82,7 +82,7 @@ static mach_port_t io_master_port = MACH_PORT_NULL; /* This defaults to false for backwards compatibility. Please fix in the next * major version. */ -static _Bool use_bsd_name = 0; +static bool use_bsd_name; /* #endif HAVE_IOKIT_IOKITLIB_H */ #elif KERNEL_LINUX @@ -106,9 +106,9 @@ typedef struct diskstats { derive_t avg_read_time; derive_t avg_write_time; - _Bool has_merged; - _Bool has_in_progress; - _Bool has_io_time; + bool has_merged; + bool has_in_progress; + bool has_io_time; struct diskstats *next; } diskstats_t; @@ -170,7 +170,7 @@ static int disk_config(const char *key, const char *value) { ignorelist_set_invert(ignorelist, invert); } else if (strcasecmp("UseBSDName", key) == 0) { #if HAVE_IOKIT_IOKITLIB_H - use_bsd_name = IS_TRUE(value) ? 1 : 0; + use_bsd_name = IS_TRUE(value); #else WARNING("disk plugin: The \"UseBSDName\" option is only supported " "on Mach / Mac OS X and will be ignored."); @@ -817,13 +817,13 @@ static int disk_read(void) { ds->write_time = write_time; if (read_merged || write_merged) - ds->has_merged = 1; + ds->has_merged = true; if (in_progress) - ds->has_in_progress = 1; + ds->has_in_progress = true; if (io_time) - ds->has_io_time = 1; + ds->has_io_time = true; } /* if (is_disk) */