Run all changed files 68 8.c/1 *.h through clang-format agin..

(cherry picked from commit 626d3ab4309cdb069289354c45ca9e2ba9bc9a2f)

diff --git a/src/amqp.c b/src/amqp.c
index 39575b9..2077d57 100644 (file)
--- a/src/amqp.c
+++ b/src/amqp.c
@@ -320,17 +320,17 @@ static int camqp_setup_queue(camqp_config_t *conf) /* {{{ */
   amqp_queue_declare_ok_t *qd_ret;
   amqp_basic_consume_ok_t *cm_ret;
 
-  qd_ret = amqp_queue_declare(conf->connection,
-                              /* channel     = */ CAMQP_CHANNEL,
-                              /* queue       = */
-                                  (conf->queue != NULL)
-                                  ? amqp_cstring_bytes(conf->queue)
-                                  : AMQP_EMPTY_BYTES,
-                              /* passive     = */ 0,
-                              /* durable     = */ conf->queue_durable,
-                              /* exclusive   = */ 0,
-                              /* auto_delete = */ conf->queue_auto_delete,
-                              /* arguments   = */ AMQP_EMPTY_TABLE);
+  qd_ret =
+      amqp_queue_declare(conf->connection,
+                         /* channel     = */ CAMQP_CHANNEL,
+                         /* queue       = */
+                         (conf->queue != NULL) ? amqp_cstring_bytes(conf->queue)
+                                               : AMQP_EMPTY_BYTES,
+                         /* passive     = */ 0,
+                         /* durable     = */ conf->queue_durable,
+                         /* exclusive   = */ 0,
+                         /* auto_delete = */ conf->queue_auto_delete,
+                         /* arguments   = */ AMQP_EMPTY_TABLE);
   if (qd_ret == NULL) {
     ERROR("amqp plugin: amqp_queue_declare failed.");
     camqp_close_connection(conf);
@@ -360,8 +360,8 @@ static int camqp_setup_queue(camqp_config_t *conf) /* {{{ */
         /* queue       = */ amqp_cstring_bytes(conf->queue),
         /* exchange    = */ amqp_cstring_bytes(conf->exchange),
         /* routing_key = */
-            (conf->routing_key != NULL) ? amqp_cstring_bytes(conf->routing_key)
-                                        : AMQP_EMPTY_BYTES,
+        (conf->routing_key != NULL) ? amqp_cstring_bytes(conf->routing_key)
+                                    : AMQP_EMPTY_BYTES,
         /* arguments   = */ AMQP_EMPTY_TABLE);
     if ((qb_ret == NULL) && camqp_is_error(conf)) {
       char errbuf[1024];

diff --git a/src/intel_pmu.c b/src/intel_pmu.c
index f04f887..350c1e3 100644 (file)
--- a/src/intel_pmu.c
+++ b/src/intel_pmu.c
@@ -26,8 +26,8 @@
  *   Kamil Wiatrowski <kamilx.wiatrowski@intel.com>
  **/
 
-#include "collectd.h"
 #include "utils/common/common.h"
+#include "collectd.h"
 
 #include "utils/config_cores/config_cores.h"
 

diff --git a/src/intel_rdt.c b/src/intel_rdt.c
index 515a601..38f987f 100644 (file)
--- a/src/intel_rdt.c
+++ b/src/intel_rdt.c
@@ -28,11 +28,11 @@
  *   Michał Aleksiński <michalx.aleksinski@intel.com>
  **/
 
-#include "collectd.h"
+#include <pqos.h>
 #include "utils/common/common.h"
 #include "utils/config_cores/config_cores.h"
 #include "utils/proc_pids/proc_pids.h"
-#include <pqos.h>
+#include "collectd.h"
 
 #define RDT_PLUGIN "intel_rdt"
 

diff --git a/src/lua.c b/src/lua.c
index 3f48a55..a87f3ea 100644 (file)
--- a/src/lua.c
+++ b/src/lua.c
@@ -28,10 +28,10 @@
  *   Ruben Kerkhof <ruben at rubenkerkhof.com>
  **/
 
-#include "collectd.h"
 #include "plugin.h"
 #include "utils/common/common.h"
 #include "utils_lua.h"
+#include "collectd.h"
 
 /* Include the Lua API header files. */
 #include <lauxlib.h>

diff --git a/src/perl.c b/src/perl.c
index 0a4ae71..d0c9917 100644 (file)
--- a/src/perl.c
+++ b/src/perl.c
@@ -33,8 +33,8 @@
 /* do not automatically get the thread specific Perl interpreter */
 #define PERL_NO_GET_CONTEXT
 
-#include "collectd.h"
 #include <stdbool.h>
+#include "collectd.h"
 
 #include <EXTERN.h>
 #include <perl.h>

diff --git a/src/snmp_agent.c b/src/snmp_agent.c
index bb4a7e4..d75c16e 100644 (file)
--- a/src/snmp_agent.c
+++ b/src/snmp_agent.c
@@ -29,11 +29,11 @@
 
 #include "collectd.h"
 
+#include <regex.h>
 #include "utils/avltree/avltree.h"
 #include "utils/common/common.h"
 #include "utils_cache.h"
 #include "utils_llist.h"
-#include <regex.h>
 
 #include <net-snmp/net-snmp-config.h>