d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to current devstat API.

Browse Source
This commit is contained in:
Poul-Henning Kamp 2003-03-15 21:04:50 +00:00
parent 26c4bf80c2
commit a57042df90
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libexec/rpc.rstatd/rstat_proc.c
View File

@ -331,13 +331,13 @@ haveadisk(void)
struct statinfo stats; struct statinfo stats;
int num_devices, retval = 0; int num_devices, retval = 0;
if ((num_devices = getnumdevs()) < 0) { if ((num_devices = devstat_getnumdevs(NULL)) < 0) {
syslog(LOG_ERR, "rstatd: can't get number of devices: %s", syslog(LOG_ERR, "rstatd: can't get number of devices: %s",
devstat_errbuf); devstat_errbuf);
exit(1); exit(1);
} }
if (checkversion() < 0) { if (devstat_checkversion(NULL) < 0) {
syslog(LOG_ERR, "rstatd: %s", devstat_errbuf); syslog(LOG_ERR, "rstatd: %s", devstat_errbuf);
exit(1); exit(1);
} }
@ -345,7 +345,7 @@ haveadisk(void)
stats.dinfo = (struct devinfo *)malloc(sizeof(struct devinfo)); stats.dinfo = (struct devinfo *)malloc(sizeof(struct devinfo));
bzero(stats.dinfo, sizeof(struct devinfo)); bzero(stats.dinfo, sizeof(struct devinfo));
if (getdevs(&stats) == -1) { if (devstat_getdevs(NULL, &stats) == -1) {
syslog(LOG_ERR, "rstatd: can't get device list: %s", syslog(LOG_ERR, "rstatd: can't get device list: %s",
devstat_errbuf); devstat_errbuf);
exit(1); exit(1);
@ -375,13 +375,13 @@ updatexfers(int numdevs, int *devs)
int num_devices = 0; int num_devices = 0;
u_int64_t total_transfers; u_int64_t total_transfers;
if ((num_devices = getnumdevs()) < 0) { if ((num_devices = devstat_getnumdevs(NULL)) < 0) {
syslog(LOG_ERR, "rstatd: can't get number of devices: %s", syslog(LOG_ERR, "rstatd: can't get number of devices: %s",
devstat_errbuf); devstat_errbuf);
exit(1); exit(1);
} }
if (checkversion() < 0) { if (devstat_checkversion(NULL) < 0) {
syslog(LOG_ERR, "rstatd: %s", devstat_errbuf); syslog(LOG_ERR, "rstatd: %s", devstat_errbuf);
exit(1); exit(1);
} }
@ -389,7 +389,7 @@ updatexfers(int numdevs, int *devs)
stats.dinfo = (struct devinfo *)malloc(sizeof(struct devinfo)); stats.dinfo = (struct devinfo *)malloc(sizeof(struct devinfo));
bzero(stats.dinfo, sizeof(struct devinfo)); bzero(stats.dinfo, sizeof(struct devinfo));
if (getdevs(&stats) == -1) { if (devstat_getdevs(NULL, &stats) == -1) {
syslog(LOG_ERR, "rstatd: can't get device list: %s", syslog(LOG_ERR, "rstatd: can't get device list: %s",
devstat_errbuf); devstat_errbuf);
exit(1); exit(1);