aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlf Lilleengen <lulf@FreeBSD.org>2008-09-30 07:18:49 +0000
committerUlf Lilleengen <lulf@FreeBSD.org>2008-09-30 07:18:49 +0000
commitbd5add5884ab280bd71ea125fac9c20c3eb13bc7 (patch)
tree91194d97b4792749cc951e6a2233b54b2458b2ba
parentad415775a173a3a22fd1322acd381b9e17f3c123 (diff)
downloadsrc-bd5add5884ab280bd71ea125fac9c20c3eb13bc7.tar.gz
src-bd5add5884ab280bd71ea125fac9c20c3eb13bc7.zip
- Improve error message given on g_providername call failure.
- While there, make error messages consistent with the rest. Approved by: kib (mentor)
Notes
Notes: svn path=/head/; revision=183487
-rw-r--r--sbin/bsdlabel/bsdlabel.c2
-rw-r--r--sbin/fdisk/fdisk.c2
-rw-r--r--usr.sbin/boot0cfg/boot0cfg.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/sbin/bsdlabel/bsdlabel.c b/sbin/bsdlabel/bsdlabel.c
index d3ec8992bf99..97ddeb6aceb1 100644
--- a/sbin/bsdlabel/bsdlabel.c
+++ b/sbin/bsdlabel/bsdlabel.c
@@ -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);
}
}
diff --git a/sbin/fdisk/fdisk.c b/sbin/fdisk/fdisk.c
index e54003881fca..90b34036965e 100644
--- a/sbin/fdisk/fdisk.c
+++ b/sbin/fdisk/fdisk.c
@@ -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);
diff --git a/usr.sbin/boot0cfg/boot0cfg.c b/usr.sbin/boot0cfg/boot0cfg.c
index 63fa78e5549c..6f10308b7e3b 100644
--- a/usr.sbin/boot0cfg/boot0cfg.c
+++ b/usr.sbin/boot0cfg/boot0cfg.c
@@ -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)