- Improve error message given on g_providername call failure.

- While there, make error messages consistent with the rest.

Approved by:	kib (mentor)
This commit is contained in:
Ulf Lilleengen 2008-09-30 07:18:49 +00:00
parent ad415775a1
commit bd5add5884
3 changed files with 4 additions and 4 deletions

View File

@ -238,7 +238,7 @@ main(int argc, char *argv[])
pname = g_providername(fd);
close(fd);
if (pname == NULL) {
warnx("error getting providername for %s", specname);
warn("error getting providername for %s", specname);
return(1);
}
}

View File

@ -770,7 +770,7 @@ write_disk(off_t sector, void *buf)
gctl_ro_param(grq, "class", -1, "MBR");
pname = g_providername(fd);
if (pname == NULL) {
warnx("Error getting providername for %s\n", disk);
warn("Error getting providername for %s", disk);
return (-1);
}
gctl_ro_param(grq, "geom", -1, pname);

View File

@ -274,12 +274,12 @@ write_mbr(const char *fname, int flags, u_int8_t *mbr, int mbr_size)
/* Try open it read only. */
fd = open(fname, O_RDONLY);
if (fd == -1) {
warnx("Error opening %s\n", fname);
warn("error opening %s", fname);
return;
}
pname = g_providername(fd);
if (pname == NULL) {
warnx("Error getting providername for %s\n", fname);
warn("error getting providername for %s", fname);
return;
}
if (flags != 0)