Many build fixes that turned up with GCC 4.6.

[collectd.git] / src / openvpn.c

diff --git a/src/openvpn.c b/src/openvpn.c
index 8c0f82d..2aca414 100644 (file)
--- a/src/openvpn.c
+++ b/src/openvpn.c
@@ -299,15 +299,15 @@ static int multi1_read (char *name, FILE *fh)
                {
                        if (new_naming_schema)
                        {
-                               iostats_submit (fields[0],          /* "Common Name" */
-                                               NULL,               /* unused when in multimode */
+                               iostats_submit (name,               /* vpn instance */
+                                               fields[0],          /* "Common Name" */
                                                atoll (fields[2]),  /* "Bytes Received" */
                                                atoll (fields[3])); /* "Bytes Sent" */
                        }
                        else
                        {
-                               iostats_submit (name,               /* vpn instance */
-                                               fields[0],          /* "Common Name" */
+                               iostats_submit (fields[0],          /* "Common Name" */
+                                               NULL,               /* unused when in multimode */
                                                atoll (fields[2]),  /* "Bytes Received" */
                                                atoll (fields[3])); /* "Bytes Sent" */
                        }