Tidy up formatting with clang-format.

diff --git a/src/daemon/collectd.c b/src/daemon/collectd.c
index 278453955a338cd4095fe59e7fc64e34942f49dd..791199ffb6302a8968749a23bedb677cd1d93f12 100644 (file)
--- a/src/daemon/collectd.c
+++ b/src/daemon/collectd.c
@@ -464,11 +464,12 @@ void read_cmdline(int argc, char **argv, struct cmdline_config *config) {
   /* read options */
   while (1) {
     int c;
-    c = getopt(argc, argv, "htTC:"
+    c = getopt(argc, argv,
+               "htTC:"
 #if COLLECT_DAEMON
-                           "fP:"
+               "fP:"
 #endif
-               );
+    );
 
     if (c == -1)
       break;
@@ -553,7 +554,9 @@ int main(int argc, char **argv) {
   int exit_status = 0;
 
   struct cmdline_config config = {
-      .daemonize = 1, .create_basedir = 1, .configfile = CONFIGFILE,
+      .daemonize = 1,
+      .create_basedir = 1,
+      .configfile = CONFIGFILE,
   };
 
   read_cmdline(argc, argv, &config);
@@ -586,7 +589,7 @@ int main(int argc, char **argv) {
 #ifdef KERNEL_LINUX
       && notify_upstart() == 0 && notify_systemd() == 0
 #endif
-      ) {
+  ) {
     int status;
 
     if ((pid = fork()) == -1) {

diff --git a/src/daemon/configfile.c b/src/daemon/configfile.c
index eb6f413cd9ec0105d6b346df886d7dc03a6685cc..83e44b72cdb31b51b2b1ef814d4c50716e234f93 100644 (file)
--- a/src/daemon/configfile.c
+++ b/src/daemon/configfile.c
@@ -874,7 +874,8 @@ const char *global_option_get(const char *option) {
     return NULL;
   }
 
-  return (cf_global_options[i].value != NULL) ? cf_global_options[i].value : cf_global_options[i].def;
+  return (cf_global_options[i].value != NULL) ? cf_global_options[i].value
+                                              : cf_global_options[i].def;
 } /* char *global_option_get */
 
 long global_option_get_long(const char *option, long default_value) {

diff --git a/src/daemon/globals.c b/src/daemon/globals.c
index 9b0aec739997c1af2419a021b87df8e57e311615..3d3c7ab2b7cfcb6a125783fdc95fcd792ce320ca 100644 (file)
--- a/src/daemon/globals.c
+++ b/src/daemon/globals.c
@@ -21,8 +21,8 @@
  * DEALINGS IN THE SOFTWARE.
  **/
 
-#include "common.h"
 #include "globals.h"
+#include "common.h"
 
 #if HAVE_KSTAT_H
 #include <kstat.h>
@@ -33,17 +33,16 @@
  */
 char *hostname_g;
 cdtime_t interval_g;
-int  timeout_g;
+int timeout_g;
 #if HAVE_KSTAT_H
 kstat_ctl_t *kc;
 #endif
 
 void hostname_set(char const *hostname) {
-    char *h = strdup(hostname);
-      if (h == NULL)
-            return;
+  char *h = strdup(hostname);
+  if (h == NULL)
+    return;
 
-        free(hostname_g);
-          hostname_g = h;
+  free(hostname_g);
+  hostname_g = h;
 }
-

diff --git a/src/daemon/globals.h b/src/daemon/globals.h
index 587b223b9c08aa3ff4e69d37d3e53fbff9cf128a..bc11d6bfdf9e4013d962baa6a09651318cae20ff 100644 (file)
--- a/src/daemon/globals.h
+++ b/src/daemon/globals.h
@@ -36,8 +36,8 @@ typedef uint64_t cdtime_t;
 /* hostname_set updates hostname_g */
 void hostname_set(char const *hostname);
 
-extern char       *hostname_g;
-extern cdtime_t   interval_g;
-extern int        pidfile_from_cli;
-extern int        timeout_g;
+extern char *hostname_g;
+extern cdtime_t interval_g;
+extern int pidfile_from_cli;
+extern int timeout_g;
 #endif /* GLOBALS_H */

diff --git a/src/daemon/plugin.h b/src/daemon/plugin.h
index 095d662f0b83a35eb800b295782132a7a234b9d6..a9ee72d4c9328c2e9827468cb8dff27998894c95 100644 (file)
--- a/src/daemon/plugin.h
+++ b/src/daemon/plugin.h
@@ -42,13 +42,13 @@
 #define DS_TYPE_ABSOLUTE 3
 
 #define DS_TYPE_TO_STRING(t)                                                   \
-  (t == DS_TYPE_COUNTER) ? "counter" : (t == DS_TYPE_GAUGE)                    \
-                                           ? "gauge"                           \
-                                           : (t == DS_TYPE_DERIVE)             \
-                                                 ? "derive"                    \
-                                                 : (t == DS_TYPE_ABSOLUTE)     \
-                                                       ? "absolute"            \
-                                                       : "unknown"
+  (t == DS_TYPE_COUNTER)                                                       \
+      ? "counter"                                                              \
+      : (t == DS_TYPE_GAUGE)                                                   \
+            ? "gauge"                                                          \
+            : (t == DS_TYPE_DERIVE)                                            \
+                  ? "derive"                                                   \
+                  : (t == DS_TYPE_ABSOLUTE) ? "absolute" : "unknown"
 
 #ifndef LOG_ERR
 #define LOG_ERR 3

diff --git a/src/perl.c b/src/perl.c
index 9268086fd8e82c11848e7ad009b8bc8b8ce8a27c..671d1f3fa41b1353c35f8fae01d64117aa017f27 100644 (file)
--- a/src/perl.c
+++ b/src/perl.c
@@ -2093,7 +2093,7 @@ static int perl_init(void) {
   /* Lock the base thread to avoid race conditions with c_ithread_create().
    * See https://github.com/collectd/collectd/issues/9 and
    *     https://github.com/collectd/collectd/issues/1706 for details.
-  */
+   */
   assert(aTHX == perl_threads->head->interp);
   pthread_mutex_lock(&perl_threads->mutex);
 
@@ -2184,7 +2184,7 @@ static void perl_log(int level, const char *msg, user_data_t *user_data) {
   /* Lock the base thread if this is not called from one of the read threads
    * to avoid race conditions with c_ithread_create(). See
    * https://github.com/collectd/collectd/issues/9 for details.
-  */
+   */
 
   if (aTHX == perl_threads->head->interp)
     pthread_mutex_lock(&perl_threads->mutex);
@@ -2343,14 +2343,25 @@ static int g_interval_set(pTHX_ SV *var, MAGIC *mg) {
   return 0;
 } /* static int g_interval_set (pTHX_ SV *, MAGIC *) */
 
-static MGVTBL g_pv_vtbl = {g_pv_get, g_pv_set, NULL, NULL, NULL, NULL, NULL
+static MGVTBL g_pv_vtbl = {g_pv_get,
+                           g_pv_set,
+                           NULL,
+                           NULL,
+                           NULL,
+                           NULL,
+                           NULL
 #if HAVE_PERL_STRUCT_MGVTBL_SVT_LOCAL
                            ,
                            NULL
 #endif
 };
-static MGVTBL g_interval_vtbl = {g_interval_get, g_interval_set, NULL, NULL,
-                                 NULL, NULL, NULL
+static MGVTBL g_interval_vtbl = {g_interval_get,
+                                 g_interval_set,
+                                 NULL,
+                                 NULL,
+                                 NULL,
+                                 NULL,
+                                 NULL
 #if HAVE_PERL_STRUCT_MGVTBL_SVT_LOCAL
                                  ,
                                  NULL
@@ -2385,8 +2396,8 @@ static void xs_init(pTHX) {
    * tie() in Perl) */
   /* global strings */
   struct {
-      char name[64];
-      char *var;
+    char name[64];
+    char *var;
   } g_strings[] = {{"Collectd::hostname_g", hostname_g}, {"", NULL}};
 
   for (int i = 0; '\0' != g_strings[i].name[0]; ++i) {