Another round of clang-format

related to backports/cherry-picks.

diff --git a/src/amqp.c b/src/amqp.c
index 4bdb66c..2077d57 100644 (file)
--- a/src/amqp.c
+++ b/src/amqp.c
@@ -973,11 +973,11 @@ static int camqp_config_connection(oconfig_item_t *ci, /* {{{ */
     char cbname[128];
     ssnprintf(cbname, sizeof(cbname), "amqp/%s", conf->name);
 
-    status =
-        plugin_register_write(cbname, camqp_write,
-                              &(user_data_t){
-                                  .data = conf, .free_func = camqp_config_free,
-                              });
+    status = plugin_register_write(cbname, camqp_write,
+                                   &(user_data_t){
+                                       .data = conf,
+                                       .free_func = camqp_config_free,
+                                   });
     if (status != 0) {
       camqp_config_free(conf);
       return status;

diff --git a/src/intel_rdt.c b/src/intel_rdt.c
index 743c8bc..515a601 100644 (file)
--- a/src/intel_rdt.c
+++ b/src/intel_rdt.c
@@ -851,9 +851,9 @@ static void rdt_init_pids_monitoring() {
     }
 
     /* update global proc_pids table */
-    proc_pids_t **proc_pids = realloc(g_rdt->proc_pids,
-                                      (g_rdt->num_proc_pids + ng->num_names) *
-                                          sizeof(*g_rdt->proc_pids));
+    proc_pids_t **proc_pids =
+        realloc(g_rdt->proc_pids, (g_rdt->num_proc_pids + ng->num_names) *
+                                      sizeof(*g_rdt->proc_pids));
     if (NULL == proc_pids) {
       ERROR(RDT_PLUGIN ": Alloc error\n");
       continue;

diff --git a/src/notify_desktop.c b/src/notify_desktop.c
index 266c77c..e430b68 100644 (file)
--- a/src/notify_desktop.c
+++ b/src/notify_desktop.c
@@ -102,7 +102,7 @@ static int c_notify(const notification_t *n,
 
   notification = notify_notification_new(summary, n->message, NULL
 #if NOTIFY_CHECK_VERSION(0, 7, 0)
-                                         );
+  );
 #else
                                          ,
                                          NULL);

diff --git a/src/utils/oauth/oauth.c b/src/utils/oauth/oauth.c
index e185c43..a7ae75d 100644 (file)
--- a/src/utils/oauth/oauth.c
+++ b/src/utils/oauth/oauth.c
@@ -531,7 +531,8 @@ oauth_google_t oauth_create_google_json(char const *buffer, char const *scope) {
   }
 
   oauth_google_t ret = {
-      .project_id = strdup(project_id), .oauth = oauth,
+      .project_id = strdup(project_id),
+      .oauth = oauth,
   };
 
   yajl_tree_free(root);

diff --git a/src/utils/ovs/ovs.c b/src/utils/ovs/ovs.c
index 127a917..52a590b 100644 (file)
--- a/src/utils/ovs/ovs.c
+++ b/src/utils/ovs/ovs.c
@@ -785,7 +785,9 @@ static void *ovs_poll_worker(void *arg) {
   ovs_db_t *pdb = (ovs_db_t *)arg; /* pointer to OVS DB */
   ovs_json_reader_t *jreader = NULL;
   struct pollfd poll_fd = {
-      .fd = pdb->sock, .events = POLLIN | POLLPRI, .revents = 0,
+      .fd = pdb->sock,
+      .events = POLLIN | POLLPRI,
+      .revents = 0,
   };
 
   /* create JSON reader instance */

diff --git a/src/write_redis.c b/src/write_redis.c
index 880323c..32005cd 100644 (file)
--- a/src/write_redis.c
+++ b/src/write_redis.c
@@ -242,11 +242,11 @@ static int wr_config_node(oconfig_item_t *ci) /* {{{ */
 
     ssnprintf(cb_name, sizeof(cb_name), "write_redis/%s", node->name);
 
-    status =
-        plugin_register_write(cb_name, wr_write,
-                              &(user_data_t){
-                                  .data = node, .free_func = wr_config_free,
-                              });
+    status = plugin_register_write(cb_name, wr_write,
+                                   &(user_data_t){
+                                       .data = node,
+                                       .free_func = wr_config_free,
+                                   });
   }
 
   if (status != 0)