X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Fnetlink.c;h=b998cf316c6522b09f068a04b83cb7956c3c305f;hp=a3b40d492dc32e696bf21ae97d61b61dd815dea7;hb=48622c3d7c8c0d3ab07cda8a1947c33bfe31df73;hpb=abaa1c8a24e8eff5632dd6052b1da5f6535caf19 diff --git a/src/netlink.c b/src/netlink.c index a3b40d49..b998cf31 100644 --- a/src/netlink.c +++ b/src/netlink.c @@ -198,7 +198,8 @@ static void submit_two(const char *dev, const char *type, const char *type_instance, derive_t rx, derive_t tx) { value_list_t vl = VALUE_LIST_INIT; value_t values[] = { - {.derive = rx}, {.derive = tx}, + {.derive = rx}, + {.derive = tx}, }; vl.values = values; @@ -510,7 +511,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 +543,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 +582,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); @@ -637,7 +638,7 @@ static int ir_config(const char *key, const char *value) { } else if ((strcasecmp(key, "QDisc") == 0) || (strcasecmp(key, "Class") == 0) || (strcasecmp(key, "Filter") == 0)) { - if ((fields_num < 1) || (fields_num > 2)) { + if (fields_num > 2) { ERROR("netlink plugin: Invalid number of fields for option " "`%s'. Got %i, expected 1 or 2.", key, fields_num);