Merge branch 'SIGAR-164' into sigar-1.6

hyperic · Jul 19, 2009 · ab87592 · ab87592
2 parents 8cef393 + ceab542
commit ab87592
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/os/aix/aix_sigar.c b/src/os/aix/aix_sigar.c
@@ -1247,7 +1247,7 @@ int sigar_disk_usage_get(sigar_t *sigar, const char *name,
     SIGAR_SSTRCPY(id.name, name);
 
     if (perfstat_disk(&id, &disk, sizeof(disk), 1) != 1) {
-        return ENOENT;
+        return ENXIO;
     }
 
     usage->reads = disk.rblks;

diff --git a/src/os/darwin/darwin_sigar.c b/src/os/darwin/darwin_sigar.c
@@ -2137,7 +2137,7 @@ int sigar_disk_usage_get(sigar_t *sigar, const char *name,
     SIGAR_DISK_STATS_INIT(disk);
 
     if (!iodev) {
-        return ESRCH;
+        return ENXIO;
     }
 
     /* "/dev/disk0s1" -> "disk0" */ /* XXX better way? */

diff --git a/src/os/linux/linux_sigar.c b/src/os/linux/linux_sigar.c
@@ -1159,7 +1159,7 @@ static int get_iostat_sys(sigar_t *sigar,
     int partition, status;
 
     if (!(*iodev = sigar_iodev_get(sigar, dirname))) {
-        return ENOENT;
+        return ENXIO;
     }
 
     name = fsdev = (*iodev)->name;
@@ -1211,7 +1211,7 @@ static int get_iostat_proc_dstat(sigar_t *sigar,
     SIGAR_DISK_STATS_INIT(device_usage);
 
     if (!(*iodev = sigar_iodev_get(sigar, dirname))) {
-        return ENOENT;
+        return ENXIO;
     }
 
     if (stat((*iodev)->name, &sb) < 0) {
@@ -1313,7 +1313,7 @@ static int get_iostat_procp(sigar_t *sigar,
     struct stat sb;
 
     if (!(*iodev = sigar_iodev_get(sigar, dirname))) {
-        return ENOENT;
+        return ENXIO;
     }
 
     if (stat((*iodev)->name, &sb) < 0) {

diff --git a/src/os/win32/win32_sigar.c b/src/os/win32/win32_sigar.c
@@ -1956,7 +1956,7 @@ SIGAR_DECLARE(int) sigar_disk_usage_get(sigar_t *sigar,
         }
     }
 
-    return ENOENT;
+    return ENXIO;
 }
 
 SIGAR_DECLARE(int)