From: Karel Zak <kzak@redhat.com>
Date: Mon, 18 Jul 2011 14:57:55 +0000 (+0200)
Subject: fdformat: cleanup error messages
X-Git-Tag: v2.20-rc1~85
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3160fcf3268a3e7d0bec0d20b4221d0ada8215d5;p=thirdparty%2Futil-linux.git

fdformat: cleanup error messages

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/disk-utils/fdformat.c b/disk-utils/fdformat.c
index d1d81464aa..670242f8af 100644
--- a/disk-utils/fdformat.c
+++ b/disk-utils/fdformat.c
@@ -1,11 +1,6 @@
-/* fdformat.c  -  Low-level formats a floppy disk - Werner Almesberger */
-
-/* 1999-02-22 Arkadiusz Mi¶kiewicz <misiek@pld.ORG.PL>
- * - added Native Language Support
- * 1999-03-20 Arnaldo Carvalho de Melo <acme@conectiva.com.br>
- & - more i18n/nls translatable strings marked
+/*
+ * fdformat.c  -  Low-level formats a floppy disk - Werner Almesberger
  */
-
 #include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
@@ -32,23 +27,23 @@ static void format_disk(int ctrl)
 	printf(_("Formatting ... "));
 	fflush(stdout);
 	if (ioctl(ctrl, FDFMTBEG, NULL) < 0)
-		err(EXIT_FAILURE, "\nioctl(FDFMTBEG)");
+		err(EXIT_FAILURE, "ioctl: FDFMTBEG");
 	for (track = 0; track < param.track; track++) {
 		descr.track = track;
 		descr.head = 0;
-		if (ioctl(ctrl, FDFMTTRK, (long)&descr) < 0)
-			err(EXIT_FAILURE, "\nioctl(FDFMTTRK)");
+		if (ioctl(ctrl, FDFMTTRK, (long) &descr) < 0)
+			err(EXIT_FAILURE, "ioctl: FDFMTTRK");
 
 		printf("%3d\b\b\b", track);
 		fflush(stdout);
 		if (param.head == 2) {
 			descr.head = 1;
 			if (ioctl(ctrl, FDFMTTRK, (long)&descr) < 0)
-				err(EXIT_FAILURE, "\nioctl(FDFMTTRK)");
+				err(EXIT_FAILURE, "ioctl: FDFMTTRK");
 		}
 	}
 	if (ioctl(ctrl, FDFMTEND, NULL) < 0)
-		err(EXIT_FAILURE, "\nioctl(FDFMTEND)");
+		err(EXIT_FAILURE, "ioctl: FDFMTEND");
 	printf(_("done\n"));
 }