X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fovs_stats.c;h=da218b6f3ade020b56d9fedb84ded7f234f7ba4d;hb=c4439c9cb3e2348ad7013644731de27a55eca478;hp=eca7329e8c8352b3a9ccdb1aed163b51b8d2b776;hpb=bcc7d4720491aac9302cbe91629487d3ddedbc8f;p=collectd.git

diff --git a/src/ovs_stats.c b/src/ovs_stats.c
index eca7329e..da218b6f 100644
--- a/src/ovs_stats.c
+++ b/src/ovs_stats.c
@@ -28,9 +28,9 @@
  *   Taras Chornyi <tarasx.chornyi@intel.com>
  */
 
-#include "common.h"
+#include "utils/common/common.h"
 
-#include "utils_ovs.h" /* OvS helpers */
+#include "utils/ovs/ovs.h" /* OvS helpers */
 
 /* Plugin name */
 static const char plugin_name[] = "ovs_stats";
@@ -280,8 +280,11 @@ static void ovs_stats_submit_interfaces(port_list_t *port) {
       if (strlen(iface->ex_iface_id))
         meta_data_add_string(meta, "iface-id", iface->ex_iface_id);
     }
-    snprintf(devname, sizeof(devname), "%s.%s.%s", bridge->name, port->name,
-             iface->name);
+    strjoin(devname, sizeof(devname),
+            (char *[]){
+                bridge->name, port->name, iface->name,
+            },
+            3, ".");
     ovs_stats_submit_one(devname, "if_collisions", NULL,
                          iface->stats[collisions], meta);
     ovs_stats_submit_two(devname, "if_dropped", NULL, iface->stats[rx_dropped],
@@ -857,7 +860,7 @@ static int ovs_stats_update_port(const char *uuid, yajl_val port) {
 
     // ifaces_list is [[ "uuid", "<some_uuid>" ], [ "uuid",
     // "<another_uuid>" ], ... ]]
-    for (int i = 0; i < YAJL_GET_ARRAY(ifaces_list)->len; i++) {
+    for (size_t i = 0; i < YAJL_GET_ARRAY(ifaces_list)->len; i++) {
       yajl_val iface_tuple = YAJL_GET_ARRAY(ifaces_list)->values[i];
 
       // iface_tuple is [ "uuid", "<some_uuid>" ]