Merge branch 'collectd-5.8'

[collectd.git] / src / ovs_stats.c

diff --git a/src/ovs_stats.c b/src/ovs_stats.c
index c8efdad..eca7329 100644 (file)
--- a/src/ovs_stats.c
+++ b/src/ovs_stats.c
@@ -474,27 +474,27 @@ static void ovs_stats_submit_port(port_list_t *port) {
   ovs_stats_submit_one(devname, "if_rx_errors", "rx_jabber_errors",
                        ovs_stats_get_port_stat_value(port, rx_jabber_errors),
                        meta);
-  ovs_stats_submit_one(
-      devname, "if_rx_octets", "rx_error_bytes",
-      ovs_stats_get_port_stat_value(port, rx_error_bytes), meta);
-  ovs_stats_submit_one(
-      devname, "if_errors", "rx_l3_l4_xsum_error",
-      ovs_stats_get_port_stat_value(port, rx_l3_l4_xsum_error), meta);
+  ovs_stats_submit_one(devname, "if_rx_octets", "rx_error_bytes",
+                       ovs_stats_get_port_stat_value(port, rx_error_bytes),
+                       meta);
+  ovs_stats_submit_one(devname, "if_errors", "rx_l3_l4_xsum_error",
+                       ovs_stats_get_port_stat_value(port, rx_l3_l4_xsum_error),
+                       meta);
   ovs_stats_submit_one(
       devname, "if_dropped", "rx_management_dropped",
       ovs_stats_get_port_stat_value(port, rx_management_dropped), meta);
   ovs_stats_submit_one(
       devname, "if_errors", "rx_mbuf_allocation_errors",
       ovs_stats_get_port_stat_value(port, rx_mbuf_allocation_errors), meta);
-  ovs_stats_submit_one(
-      devname, "if_octets", "rx_total_bytes",
-      ovs_stats_get_port_stat_value(port, rx_total_bytes), meta);
+  ovs_stats_submit_one(devname, "if_octets", "rx_total_bytes",
+                       ovs_stats_get_port_stat_value(port, rx_total_bytes),
+                       meta);
   ovs_stats_submit_one(
       devname, "if_packets", "rx_total_missed_packets",
       ovs_stats_get_port_stat_value(port, rx_total_missed_packets), meta);
-  ovs_stats_submit_one(
-      devname, "if_rx_errors", "rx_undersize_errors",
-      ovs_stats_get_port_stat_value(port, rx_undersize_errors), meta);
+  ovs_stats_submit_one(devname, "if_rx_errors", "rx_undersize_errors",
+                       ovs_stats_get_port_stat_value(port, rx_undersize_errors),
+                       meta);
   ovs_stats_submit_two(
       devname, "if_packets", "management_packets",
       ovs_stats_get_port_stat_value(port, rx_management_packets),
@@ -503,18 +503,18 @@ static void ovs_stats_submit_port(port_list_t *port) {
       devname, "if_packets", "multicast_packets",
       ovs_stats_get_port_stat_value(port, rx_multicast_packets),
       ovs_stats_get_port_stat_value(port, tx_multicast_packets), meta);
-  ovs_stats_submit_two(
-      devname, "if_octets", "good_bytes",
-      ovs_stats_get_port_stat_value(port, rx_good_bytes),
-      ovs_stats_get_port_stat_value(port, tx_good_bytes), meta);
-  ovs_stats_submit_two(
-      devname, "if_packets", "good_packets",
-      ovs_stats_get_port_stat_value(port, rx_good_packets),
-      ovs_stats_get_port_stat_value(port, tx_good_packets), meta);
-  ovs_stats_submit_two(
-      devname, "if_packets", "total_packets",
-      ovs_stats_get_port_stat_value(port, rx_total_packets),
-      ovs_stats_get_port_stat_value(port, tx_total_packets), meta);
+  ovs_stats_submit_two(devname, "if_octets", "good_bytes",
+                       ovs_stats_get_port_stat_value(port, rx_good_bytes),
+                       ovs_stats_get_port_stat_value(port, tx_good_bytes),
+                       meta);
+  ovs_stats_submit_two(devname, "if_packets", "good_packets",
+                       ovs_stats_get_port_stat_value(port, rx_good_packets),
+                       ovs_stats_get_port_stat_value(port, tx_good_packets),
+                       meta);
+  ovs_stats_submit_two(devname, "if_packets", "total_packets",
+                       ovs_stats_get_port_stat_value(port, rx_total_packets),
+                       ovs_stats_get_port_stat_value(port, tx_total_packets),
+                       meta);
 
   meta_data_destroy(meta);
 }
@@ -579,8 +579,8 @@ static interface_list_t *ovs_stats_new_port_interface(port_list_t *port,
   interface_list_t *iface = ovs_stats_get_port_interface(port, uuid);
 
   if (iface == NULL) {
-    iface = (interface_list_t *)calloc(1, sizeof(interface_list_t));
-    if (!iface) {
+    iface = calloc(1, sizeof(*iface));
+    if (iface == NULL) {
       ERROR("%s: Error allocating interface", plugin_name);
       return NULL;
     }
@@ -602,8 +602,8 @@ static port_list_t *ovs_stats_new_port(bridge_list_t *bridge,
   port_list_t *port = ovs_stats_get_port(uuid);
 
   if (port == NULL) {
-    port = (port_list_t *)calloc(1, sizeof(port_list_t));
-    if (!port) {
+    port = calloc(1, sizeof(*port));
+    if (port == NULL) {
       ERROR("%s: Error allocating port", plugin_name);
       return NULL;
     }
@@ -703,7 +703,7 @@ static int ovs_stats_update_bridge(yajl_val bridge) {
       ovs_stats_get_bridge(g_bridge_list_head, YAJL_GET_STRING(br_name));
   if (br == NULL) {
     br = calloc(1, sizeof(*br));
-    if (!br) {
+    if (br == NULL) {
       ERROR("%s: calloc(%zu) failed.", plugin_name, sizeof(*br));
       return -1;
     }
@@ -1312,7 +1312,7 @@ static int ovs_stats_plugin_config(oconfig_item_t *ci) {
         char const *br_name = child->values[j].value.string;
         if ((bridge = ovs_stats_get_bridge(g_monitored_bridge_list_head,
                                            br_name)) == NULL) {
-          if ((bridge = calloc(1, sizeof(bridge_list_t))) == NULL) {
+          if ((bridge = calloc(1, sizeof(*bridge))) == NULL) {
             ERROR("%s: Error allocating memory for bridge", plugin_name);
             goto cleanup_fail;
           } else {