libcollectdclient: Propagate errors when signing / encrypting network packets.

[collectd.git] / src / disk.c

diff --git a/src/disk.c b/src/disk.c
index 9c8d1e5..8830403 100644 (file)
--- a/src/disk.c
+++ b/src/disk.c
@@ -794,7 +794,7 @@ static int disk_read (void)
                        disk_submit (output_name, "disk_merged",
                                        read_merged, write_merged);
                        submit_in_progress (output_name, in_progress);
-                       submit_io_time (io_time, weighted_time);
+                       submit_io_time (output_name, io_time, weighted_time);
                } /* if (is_disk) */
 
                /* release udev-based alternate name, if allocated */
@@ -859,7 +859,12 @@ static int disk_read (void)
 
 #elif defined(HAVE_LIBSTATGRAB)
        sg_disk_io_stats *ds;
-       int disks, counter;
+# if HAVE_LIBSTATGRAB_0_90
+       size_t disks;
+# else
+       int disks;
+#endif
+       int counter;
        char name[DATA_MAX_NAME_LEN];
        
        if ((ds = sg_get_disk_io_stats(&disks)) == NULL)