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

newfs_msdos: cosmetical cleanups

Browse Source 
- Simplify diagnostic messages.
- Adopt lowercase first letters to make the messages
  more canonical.

PR:		bin/175404
Submitted by:	Christoph Mallon
Reviewed by:	bde
MFC after:	3 days
This commit is contained in:
Pedro F. Giffuni 2013-01-19 03:34:02 +00:00
parent e15f85e71c
commit f4f891a751
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=245648
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sbin/newfs_msdos/newfs_msdos.c
View File

@ -808,7 +808,7 @@ getdiskinfo(int fd, const char *fname, const char *dtype, __unused int oflag,
struct stat st; struct stat st;
if (fstat(fd, &st)) if (fstat(fd, &st))
err(1, "Cannot get disk size"); err(1, "cannot get disk size");
/* create a fake geometry for a file image */ /* create a fake geometry for a file image */
ms = st.st_size; ms = st.st_size;
dlp.d_secsize = 512; dlp.d_secsize = 512;
@ -832,18 +832,18 @@ getdiskinfo(int fd, const char *fname, const char *dtype, __unused int oflag,
if (ioctl(fd, DIOCGDINFO, &dlp) == -1) { if (ioctl(fd, DIOCGDINFO, &dlp) == -1) {
if (bpb->bpbBytesPerSec == 0 && ioctl(fd, DIOCGSECTORSIZE, if (bpb->bpbBytesPerSec == 0 && ioctl(fd, DIOCGSECTORSIZE,
&dlp.d_secsize) == -1) &dlp.d_secsize) == -1)
errx(1, "Cannot get sector size, %s", strerror(errno)); err(1, "cannot get sector size");
dlp.d_secperunit = ms / dlp.d_secsize; dlp.d_secperunit = ms / dlp.d_secsize;
if (bpb->bpbSecPerTrack == 0 && ioctl(fd, DIOCGFWSECTORS, if (bpb->bpbSecPerTrack == 0 && ioctl(fd, DIOCGFWSECTORS,
&dlp.d_nsectors) == -1) { &dlp.d_nsectors) == -1) {
warnx("Cannot get number of sectors per track, %s", strerror(errno)); warn("cannot get number of sectors per track");
dlp.d_nsectors = 63; dlp.d_nsectors = 63;
} }
if (bpb->bpbHeads == 0 && if (bpb->bpbHeads == 0 &&
ioctl(fd, DIOCGFWHEADS, &dlp.d_ntracks) == -1) { ioctl(fd, DIOCGFWHEADS, &dlp.d_ntracks) == -1) {
warnx("Cannot get number of heads, %s", strerror(errno)); warn("cannot get number of heads");
if (dlp.d_secperunit <= 63*1*1024) if (dlp.d_secperunit <= 63*1*1024)
dlp.d_ntracks = 1; dlp.d_ntracks = 1;
else if (dlp.d_secperunit <= 63*16*1024) else if (dlp.d_secperunit <= 63*16*1024)