X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Fsnmp.c;h=ae2b0d46db1166bab01dae22d04d6ed92bd303fa;hp=77349f62cc68e88d7c21b81a1c48c0d597dd324d;hb=be126043c2be20399d7670fe194645292018bde0;hpb=867ad628dc6fcd05bd584b605d7093cfc00c3d07 diff --git a/src/snmp.c b/src/snmp.c index 77349f62..ae2b0d46 100644 --- a/src/snmp.c +++ b/src/snmp.c @@ -155,7 +155,7 @@ static int csnmp_oid_to_string(char *buffer, size_t buffer_size, char *oid_str_ptr[MAX_OID_LEN]; for (size_t i = 0; i < o->oid_len; i++) { - ssnprintf(oid_str[i], sizeof(oid_str[i]), "%lu", (unsigned long)o->oid[i]); + snprintf(oid_str[i], sizeof(oid_str[i]), "%lu", (unsigned long)o->oid[i]); oid_str_ptr[i] = oid_str[i]; } @@ -703,7 +703,7 @@ static int csnmp_config_add_host(oconfig_item_t *ci) { "= %i }", hd->name, hd->address, hd->community, hd->version); - ssnprintf(cb_name, sizeof(cb_name), "snmp-%s", hd->name); + snprintf(cb_name, sizeof(cb_name), "snmp-%s", hd->name); status = plugin_register_complex_read( /* group = */ NULL, cb_name, csnmp_read_host, hd->interval, @@ -997,7 +997,7 @@ static int csnmp_strvbcopy(char *dst, /* {{{ */ else if (vb->type == ASN_BIT_STR) src = (char *)vb->val.bitstring; else if (vb->type == ASN_IPADDRESS) { - return ssnprintf(dst, dst_size, + return snprintf(dst, dst_size, "%" PRIu8 ".%" PRIu8 ".%" PRIu8 ".%" PRIu8 "", (uint8_t)vb->val.string[0], (uint8_t)vb->val.string[1], (uint8_t)vb->val.string[2], (uint8_t)vb->val.string[3]); @@ -1092,7 +1092,7 @@ static int csnmp_instance_list_add(csnmp_list_instances_t **head, value_t val = csnmp_value_list_to_value( vb, DS_TYPE_COUNTER, /* scale = */ 1.0, /* shift = */ 0.0, hd->name, dd->name); - ssnprintf(il->instance, sizeof(il->instance), "%llu", val.counter); + snprintf(il->instance, sizeof(il->instance), "%llu", val.counter); } /* TODO: Debugging output */ @@ -1222,7 +1222,7 @@ static int csnmp_dispatch_table(host_definition_t *host, if (data->instance_prefix == NULL) sstrncpy(vl.type_instance, temp, sizeof(vl.type_instance)); else - ssnprintf(vl.type_instance, sizeof(vl.type_instance), "%s%s", + snprintf(vl.type_instance, sizeof(vl.type_instance), "%s%s", data->instance_prefix, temp); }