From: Florian Forster <ff@octo.it>
Date: Thu, 22 Dec 2016 08:13:52 +0000 (+0100)
Subject: Merge pull request #2121 from octo/netapp
X-Git-Tag: collectd-5.7.1~7
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=badea203b6a82e68c54e0c55aea2a062eb388d3c;hp=be6aa28bfc12c0d35de592a56a3af84c7d8fc9a9;p=collectd.git

Merge pull request #2121 from octo/netapp

netapp plugin: Fix complation problems.
---

diff --git a/src/netapp.c b/src/netapp.c
index 4d458793..45144bf1 100644
--- a/src/netapp.c
+++ b/src/netapp.c
@@ -674,7 +674,7 @@ static int submit_double(const char *host, const char *plugin_inst, /* {{{ */
                          const char *type, const char *type_inst, double d,
                          cdtime_t timestamp, cdtime_t interval) {
   return (submit_values(host, plugin_inst, type, type_inst,
-                        &(value_t){.gauge = counter}, 1, timestamp, interval));
+                        &(value_t){.gauge = d}, 1, timestamp, interval));
 } /* }}} int submit_uint64 */
 
 /* Calculate hit ratio from old and new counters and submit the resulting
@@ -1910,15 +1910,13 @@ static int cna_query_quota(host_config_t *host) /* {{{ */
 static int cna_handle_snapvault_data(const char *hostname, /* {{{ */
                                      cfg_snapvault_t *cfg_snapvault,
                                      na_elem_t *data, cdtime_t interval) {
-  na_elem_iter_t status_iter;
-
-  status = na_elem_child(data, "status-list");
-  if (!status) {
+  na_elem_t *status_list = na_elem_child(data, "status-list");
+  if (status_list == NULL) {
     ERROR("netapp plugin: SnapVault status record missing status-list");
     return (0);
   }
 
-  status_iter = na_child_iterator(status);
+  na_elem_iter_t status_iter = na_child_iterator(status_list);
   for (na_elem_t *status = na_iterator_next(&status_iter); status != NULL;
        status = na_iterator_next(&status_iter)) {
     const char *dest_sys, *dest_path, *src_sys, *src_path;