From: Florian Forster Date: Tue, 15 Jul 2008 15:12:21 +0000 (+0200) Subject: Merge branch 'collectd-4.4' X-Git-Tag: collectd-4.5.0~93^2 X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=92445ff3363441d0f515de4a3ab92a504cfc0366;p=collectd.git Merge branch 'collectd-4.4' Conflicts: src/snmp.c --- 92445ff3363441d0f515de4a3ab92a504cfc0366 diff --cc src/snmp.c index 05612576,460624b4..07465ddd --- a/src/snmp.c +++ b/src/snmp.c @@@ -715,12 -714,8 +715,12 @@@ static value_t csnmp_value_list_to_valu temp = (uint32_t) vl->val.counter64->high; temp = temp << 32; temp += (uint32_t) vl->val.counter64->low; - DEBUG ("snmp plugin: Parsed int64 value is %llu.", temp); + DEBUG ("snmp plugin: Parsed int64 value is %"PRIu64".", temp); } + else if (vl->type == ASN_OCTET_STR) + { + /* We'll handle this later.. */ + } else { WARNING ("snmp plugin: I don't know the ASN type `%i'", (int) vl->type);