sensors plugin: Fix programming mistakes.

[collectd.git] / src / nfs.c

diff --git a/src/nfs.c b/src/nfs.c
index 1dc64b7..d54c838 100644 (file)
--- a/src/nfs.c
+++ b/src/nfs.c
@@ -23,7 +23,6 @@
 #include "collectd.h"
 #include "common.h"
 #include "plugin.h"
-#include "utils_debug.h"
 
 #define MODULE_NAME "nfs"
 
@@ -205,7 +204,7 @@ static void nfs_procedures_submit (const char *plugin_instance,
        vl.values = values;
        vl.values_len = 1;
        vl.time = time (NULL);
-       strcpy (vl.host, hostname);
+       strcpy (vl.host, hostname_g);
        strcpy (vl.plugin, "nfs");
        strncpy (vl.plugin_instance, plugin_instance,
                        sizeof (vl.plugin_instance));
@@ -215,7 +214,7 @@ static void nfs_procedures_submit (const char *plugin_instance,
                values[0].counter = val[i];
                strncpy (vl.type_instance, names[i],
                                sizeof (vl.type_instance));
-               DBG ("%s-%s/nfs_procedure-%s = %llu",
+               DEBUG ("%s-%s/nfs_procedure-%s = %llu",
                                vl.plugin, vl.plugin_instance,
                                vl.type_instance, val[i]);
                plugin_dispatch_values ("nfs_procedure", &vl);
@@ -251,7 +250,7 @@ static void nfs_read_stats_file (FILE *fh, char *inst)
 
                        if ((numfields - 2) != nfs2_procedures_names_num)
                        {
-                               syslog (LOG_WARNING, "nfs plugin: Wrong "
+                               WARNING ("nfs plugin: Wrong "
                                                "number of fields (= %i) "
                                                "for NFSv2 statistics.",
                                                numfields - 2);
@@ -265,9 +264,10 @@ static void nfs_read_stats_file (FILE *fh, char *inst)
                        values = (unsigned long long *) malloc (nfs2_procedures_names_num * sizeof (unsigned long long));
                        if (values == NULL)
                        {
-                               syslog (LOG_ERR, "nfs plugin: malloc "
+                               char errbuf[1024];
+                               ERROR ("nfs plugin: malloc "
                                                "failed: %s",
-                                               strerror (errno));
+                                               sstrerror (errno, errbuf, sizeof (errbuf)));
                                continue;
                        }
 
@@ -287,7 +287,7 @@ static void nfs_read_stats_file (FILE *fh, char *inst)
 
                        if ((numfields - 2) != nfs3_procedures_names_num)
                        {
-                               syslog (LOG_WARNING, "nfs plugin: Wrong "
+                               WARNING ("nfs plugin: Wrong "
                                                "number of fields (= %i) "
                                                "for NFSv3 statistics.",
                                                numfields - 2);
@@ -301,9 +301,10 @@ static void nfs_read_stats_file (FILE *fh, char *inst)
                        values = (unsigned long long *) malloc (nfs3_procedures_names_num * sizeof (unsigned long long));
                        if (values == NULL)
                        {
-                               syslog (LOG_ERR, "nfs plugin: malloc "
+                               char errbuf[1024];
+                               ERROR ("nfs plugin: malloc "
                                                "failed: %s",
-                                               strerror (errno));
+                                               sstrerror (errno, errbuf, sizeof (errbuf)));
                                continue;
                        }