From b5b01583cab80db95e8fd9c38d27db9f12f1f96c Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Mon, 28 Nov 2016 22:22:01 +0100 Subject: [PATCH] More reformatting. No idea why the previous round missed these files. --- proto/collectd.proto | 4 ++-- src/chrony.c | 14 ++++++-------- src/daemon/common.c | 6 +++--- src/utils_lua.c | 2 +- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/proto/collectd.proto b/proto/collectd.proto index 917c5deb..c706ea11 100644 --- a/proto/collectd.proto +++ b/proto/collectd.proto @@ -34,11 +34,11 @@ service Collectd { // The gRPC server embedded into collectd will inject them into the system // just like the network plugin. rpc DispatchValues(stream DispatchValuesRequest) - returns (DispatchValuesResponse); + returns(DispatchValuesResponse); // QueryValues returns a stream of matching value lists from collectd's // internal cache. - rpc QueryValues(QueryValuesRequest) returns (stream QueryValuesResponse); + rpc QueryValues(QueryValuesRequest) returns(stream QueryValuesResponse); } // The arguments to DispatchValues. diff --git a/src/chrony.c b/src/chrony.c index bf4da4a5..a10e5f68 100644 --- a/src/chrony.c +++ b/src/chrony.c @@ -786,10 +786,9 @@ static int chrony_request_daemon_stats(void) { chrony_push_data("time_ref", DAEMON_NAME, time_ref); /* unit: s */ chrony_push_data( "time_offset_ntp", DAEMON_NAME, - ntohf( - chrony_resp.body.tracking.f_current_correction)); /* Offset between - system time and - NTP, unit: s */ + ntohf(chrony_resp.body.tracking.f_current_correction)); /* Offset between + system time and + NTP, unit: s */ chrony_push_data( "time_offset", DAEMON_NAME, ntohf( @@ -807,10 +806,9 @@ static int chrony_request_daemon_stats(void) { ntohf(chrony_resp.body.tracking.f_skew_ppm)); chrony_push_data( "root_delay", DAEMON_NAME, - ntohf( - chrony_resp.body.tracking.f_root_delay)); /* Network latency between - local daemon and the - current source */ + ntohf(chrony_resp.body.tracking.f_root_delay)); /* Network latency between + local daemon and the + current source */ chrony_push_data("root_dispersion", DAEMON_NAME, ntohf(chrony_resp.body.tracking.f_root_dispersion)); chrony_push_data("clock_last_update", DAEMON_NAME, diff --git a/src/daemon/common.c b/src/daemon/common.c index fce6a563..7ead55d1 100644 --- a/src/daemon/common.c +++ b/src/daemon/common.c @@ -718,9 +718,9 @@ long long get_kstat_value(kstat_t *ksp, char *name) { else if (kn->data_type == KSTAT_DATA_UINT32) retval = (long long)kn->value.ui32; else if (kn->data_type == KSTAT_DATA_INT64) - retval = (long long) - kn->value.i64; /* According to ANSI C99 `long long' must hold - at least 64 bits */ + retval = + (long long)kn->value.i64; /* According to ANSI C99 `long long' must hold + at least 64 bits */ else if (kn->data_type == KSTAT_DATA_UINT64) retval = (long long)kn->value.ui64; /* XXX: Might overflow! */ else diff --git a/src/utils_lua.c b/src/utils_lua.c index 7f2ba04c..dcb84afa 100644 --- a/src/utils_lua.c +++ b/src/utils_lua.c @@ -28,8 +28,8 @@ * GCC will complain about the macro definition. */ #define DONT_POISON_SPRINTF_YET -#include "utils_lua.h" #include "common.h" +#include "utils_lua.h" static int ltoc_values(lua_State *L, /* {{{ */ const data_set_t *ds, value_t *ret_values) { -- 2.30.2