X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fsnmp.c;h=6a5bb8b964802af92ffad9d600e1255e2ed3a4d8;hb=5eb1fef6de7e0c8fb99e3d85063d96d7cc785f9b;hp=d6fc05dcaa278d6964f719af14832b0b7dc56ddd;hpb=c8d167c5af263b6f56b39275fd5b281bdaf48b02;p=collectd.git diff --git a/src/snmp.c b/src/snmp.c index d6fc05dc..6a5bb8b9 100644 --- a/src/snmp.c +++ b/src/snmp.c @@ -29,8 +29,6 @@ #include "plugin.h" #include "utils_complain.h" -#include - #include #include @@ -1673,7 +1671,7 @@ static int csnmp_read_table (host_definition_t *host, data_definition_t *data) static int csnmp_read_value (host_definition_t *host, data_definition_t *data) { struct snmp_pdu *req; - struct snmp_pdu *res; + struct snmp_pdu *res = NULL; struct variable_list *vb; const data_set_t *ds; @@ -1735,7 +1733,6 @@ static int csnmp_read_value (host_definition_t *host, data_definition_t *data) for (i = 0; i < data->values_len; i++) snmp_add_null_var (req, data->values[i].oid, data->values[i].oid_len); - res = NULL; status = snmp_sess_synch_response (host->sess_handle, req, &res); if ((status != STAT_SUCCESS) || (res == NULL)) @@ -1748,7 +1745,6 @@ static int csnmp_read_value (host_definition_t *host, data_definition_t *data) if (res != NULL) snmp_free_pdu (res); - res = NULL; sfree (errstr); sfree (vl.values); @@ -1774,9 +1770,7 @@ static int csnmp_read_value (host_definition_t *host, data_definition_t *data) data->scale, data->shift, host->name, data->name); } /* for (res->variables) */ - if (res != NULL) - snmp_free_pdu (res); - res = NULL; + snmp_free_pdu (res); DEBUG ("snmp plugin: -> plugin_dispatch_values (&vl);"); plugin_dispatch_values (&vl);