Merge upstream, address conflict in src/utils/cmds/cmds_test.c

[collectd.git] / src / netlink.c

diff --git a/src/netlink.c b/src/netlink.c
index a3b40d4..e8a2877 100644 (file)
--- a/src/netlink.c
+++ b/src/netlink.c
@@ -510,7 +510,7 @@ static int qos_filter_cb(const struct nlmsghdr *nlh, void *args) {
       numberic_id = tm->tcm_parent;
 
     ssnprintf(tc_inst, sizeof(tc_inst), "%s-%x:%x", kind, numberic_id >> 16,
-             numberic_id & 0x0000FFFF);
+              numberic_id & 0x0000FFFF);
   }
 
   DEBUG("netlink plugin: qos_filter_cb: got %s for %s (%i).", tc_type, dev,
@@ -542,7 +542,7 @@ static int qos_filter_cb(const struct nlmsghdr *nlh, void *args) {
       stats_submitted = true;
 
       int r = ssnprintf(type_instance, sizeof(type_instance), "%s-%s", tc_type,
-                       tc_inst);
+                        tc_inst);
       if ((size_t)r >= sizeof(type_instance)) {
         ERROR("netlink plugin: type_instance truncated to %zu bytes, need %d",
               sizeof(type_instance), r);
@@ -581,7 +581,7 @@ static int qos_filter_cb(const struct nlmsghdr *nlh, void *args) {
       char type_instance[DATA_MAX_NAME_LEN];
 
       int r = ssnprintf(type_instance, sizeof(type_instance), "%s-%s", tc_type,
-                       tc_inst);
+                        tc_inst);
       if ((size_t)r >= sizeof(type_instance)) {
         ERROR("netlink plugin: type_instance truncated to %zu bytes, need %d",
               sizeof(type_instance), r);