X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=src%2Frouteros.c;h=fa08b3b08f3e73e62b0af50b1213822cb25336ed;hb=e746ad785774de37a30302fef65f1c4aaf8698ab;hp=ba92b0b213d372ca4e84d1123f869f7c2bc7a2f0;hpb=5ff74d56067ac64db801df5184eb8b97f4b2b645;p=collectd.git diff --git a/src/routeros.c b/src/routeros.c index ba92b0b2..fa08b3b0 100644 --- a/src/routeros.c +++ b/src/routeros.c @@ -89,8 +89,7 @@ static void submit_interface(cr_data_t *rd, /* {{{ */ static int handle_interface(__attribute__((unused)) ros_connection_t *c, /* {{{ */ - const ros_interface_t *i, - void *user_data) { + const ros_interface_t *i, void *user_data) { if ((i == NULL) || (user_data == NULL)) return EINVAL; @@ -142,8 +141,8 @@ static void submit_regtable(cr_data_t *rd, /* {{{ */ return; /*** RX ***/ - ssnprintf(type_instance, sizeof(type_instance), "%s-%s-rx", r->interface, - r->radio_name); + snprintf(type_instance, sizeof(type_instance), "%s-%s-rx", r->interface, + r->radio_name); cr_submit_gauge(rd, "bitrate", type_instance, (gauge_t)(1000000.0 * r->rx_rate)); cr_submit_gauge(rd, "signal_power", type_instance, @@ -151,8 +150,8 @@ static void submit_regtable(cr_data_t *rd, /* {{{ */ cr_submit_gauge(rd, "signal_quality", type_instance, (gauge_t)r->rx_ccq); /*** TX ***/ - ssnprintf(type_instance, sizeof(type_instance), "%s-%s-tx", r->interface, - r->radio_name); + snprintf(type_instance, sizeof(type_instance), "%s-%s-tx", r->interface, + r->radio_name); cr_submit_gauge(rd, "bitrate", type_instance, (gauge_t)(1000000.0 * r->tx_rate)); cr_submit_gauge(rd, "signal_power", type_instance, @@ -160,8 +159,8 @@ static void submit_regtable(cr_data_t *rd, /* {{{ */ cr_submit_gauge(rd, "signal_quality", type_instance, (gauge_t)r->tx_ccq); /*** RX / TX ***/ - ssnprintf(type_instance, sizeof(type_instance), "%s-%s", r->interface, - r->radio_name); + snprintf(type_instance, sizeof(type_instance), "%s-%s", r->interface, + r->radio_name); cr_submit_io(rd, "if_octets", type_instance, (derive_t)r->rx_bytes, (derive_t)r->tx_bytes); cr_submit_gauge(rd, "snr", type_instance, (gauge_t)r->signal_to_noise); @@ -171,8 +170,7 @@ static void submit_regtable(cr_data_t *rd, /* {{{ */ static int handle_regtable(__attribute__((unused)) ros_connection_t *c, /* {{{ */ - const ros_registration_table_t *r, - void *user_data) { + const ros_registration_table_t *r, void *user_data) { if ((r == NULL) || (user_data == NULL)) return EINVAL; @@ -378,7 +376,7 @@ static int cr_config_router(oconfig_item_t *ci) /* {{{ */ } } - ssnprintf(read_name, sizeof(read_name), "routeros/%s", router_data->node); + snprintf(read_name, sizeof(read_name), "routeros/%s", router_data->node); if (status == 0) status = plugin_register_complex_read( /* group = */ NULL, read_name, cr_read, /* interval = */ 0,