From: Edgar Fuß Date: Thu, 9 Jul 2020 10:49:08 +0000 (+0200) Subject: clang-format X-Git-Tag: collectd-5.12.0~14^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30318d133cab06346a54ee2836671cb3e924b306;p=thirdparty%2Fcollectd.git clang-format Apply clang-format. Makes parts of the code harder to read. --- diff --git a/src/memory.c b/src/memory.c index 4bf4ed2c5..6e10ab035 100644 --- a/src/memory.c +++ b/src/memory.c @@ -98,7 +98,7 @@ static int pagesize; #endif #if KERNEL_NETBSD -# include +#include #endif static bool values_absolute = true; @@ -128,12 +128,12 @@ static int memory_init(void) { /* #endif HAVE_HOST_STATISTICS */ #elif HAVE_SYSCTLBYNAME -/* no init stuff */ -/* #endif HAVE_SYSCTLBYNAME */ + /* no init stuff */ + /* #endif HAVE_SYSCTLBYNAME */ #elif defined(KERNEL_LINUX) -/* no init stuff */ -/* #endif KERNEL_LINUX */ + /* no init stuff */ + /* #endif KERNEL_LINUX */ #elif defined(HAVE_LIBKSTAT) /* getpagesize(3C) tells me this does not fail.. */ @@ -147,7 +147,7 @@ static int memory_init(void) { return -1; } - /* #endif HAVE_LIBKSTAT */ + /* #endif HAVE_LIBKSTAT */ #elif HAVE_SYSCTL && __OpenBSD__ /* OpenBSD variant does not have sysctlbyname */ @@ -156,11 +156,11 @@ static int memory_init(void) { ERROR("memory plugin: Invalid pagesize: %i", pagesize); return -1; } - /* #endif HAVE_SYSCTL && __OpenBSD__ */ + /* #endif HAVE_SYSCTL && __OpenBSD__ */ #elif HAVE_LIBSTATGRAB -/* no init stuff */ -/* #endif HAVE_LIBSTATGRAB */ + /* no init stuff */ + /* #endif HAVE_LIBSTATGRAB */ #elif HAVE_PERFSTAT pagesize = getpagesize(); @@ -240,32 +240,28 @@ static int memory_read_internal(value_list_t *vl) { gauge_t mem_kernel; size_t size; - memset (&uvmexp, 0, sizeof (uvmexp)); - size = sizeof (uvmexp); + memset(&uvmexp, 0, sizeof(uvmexp)); + size = sizeof(uvmexp); - if (sysctl (mib, 2, &uvmexp, &size, NULL, 0) < 0) { + if (sysctl(mib, 2, &uvmexp, &size, NULL, 0) < 0) { char errbuf[1024]; - WARNING ("memory plugin: sysctl failed: %s", - sstrerror (errno, errbuf, sizeof (errbuf))); + WARNING("memory plugin: sysctl failed: %s", + sstrerror(errno, errbuf, sizeof(errbuf))); return (-1); } - assert (pagesize > 0); - mem_active = (gauge_t) (uvmexp.active * pagesize); - mem_inactive = (gauge_t) (uvmexp.inactive * pagesize); - mem_free = (gauge_t) (uvmexp.free * pagesize); - mem_wired = (gauge_t) (uvmexp.wired * pagesize); - mem_kernel = (gauge_t) ((uvmexp.npages - ( - uvmexp.active + uvmexp.inactive + - uvmexp.free + uvmexp.wired - )) * pagesize); - - MEMORY_SUBMIT ("active", mem_active, - "inactive", mem_inactive, - "free", mem_free, - "wired", mem_wired, - "kernel", mem_kernel); -/* #endif HAVE_SYSCTL && defined(KERNEL_NETBSD) */ + assert(pagesize > 0); + mem_active = (gauge_t)(uvmexp.active * pagesize); + mem_inactive = (gauge_t)(uvmexp.inactive * pagesize); + mem_free = (gauge_t)(uvmexp.free * pagesize); + mem_wired = (gauge_t)(uvmexp.wired * pagesize); + mem_kernel = (gauge_t)((uvmexp.npages - (uvmexp.active + uvmexp.inactive + + uvmexp.free + uvmexp.wired)) * + pagesize); + + MEMORY_SUBMIT("active", mem_active, "inactive", mem_inactive, "free", + mem_free, "wired", mem_wired, "kernel", mem_kernel); + /* #endif HAVE_SYSCTL && defined(KERNEL_NETBSD) */ #else /* Other HAVE_SYSCTLBYNAME providers */ /*