openvpn plugin: Fix "Dead assignment" warning.

[collectd.git] / src / openvpn.c

diff --git a/src/openvpn.c b/src/openvpn.c
index 2c93a00..5060425 100644 (file)
--- a/src/openvpn.c
+++ b/src/openvpn.c
@@ -187,8 +187,6 @@ static int single_read (char *name, FILE *fh)
        post_compress = 0;
        pre_decompress = 0;
        post_decompress = 0;
-       overhead_rx = 0;
-       overhead_tx = 0;
 
        while (fgets (buffer, sizeof (buffer), fh) != NULL)
        {
@@ -461,6 +459,8 @@ static int openvpn_read (void)
        /* call the right read function for every status entry in the list */
        for (i = 0; i < vpn_num; i++)
        {
+               int vpn_read = 0;
+
                fh = fopen (vpn_list[i]->file, "r");
                if (fh == NULL)
                {
@@ -619,6 +619,14 @@ static int openvpn_config (const char *key, const char *value)
 
                /* create a new vpn element since file, version and name are ok */
                temp = (vpn_status_t *) malloc (sizeof (vpn_status_t));
+               if (temp == NULL)
+               {
+                       char errbuf[1024];
+                       ERROR ("openvpn plugin: malloc failed: %s",
+                                       sstrerror (errno, errbuf, sizeof (errbuf)));
+                       sfree (status_file);
+                       return (1);
+               }
                temp->file = status_file;
                temp->version = status_version;
                temp->name = status_name;
@@ -627,7 +635,7 @@ static int openvpn_config (const char *key, const char *value)
                if (vpn_list == NULL)
                {
                        char errbuf[1024];
-                       ERROR ("openvpn plugin: malloc failed: %s",
+                       ERROR ("openvpn plugin: realloc failed: %s",
                                        sstrerror (errno, errbuf, sizeof (errbuf)));
 
                        sfree (temp->file);