partinfo: Print clearer error messages.
Also use complete sentences, instead of separate words filled
into a phrase. And gettextize the main output message.
Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
diff --git a/misc/partinfo.c b/misc/partinfo.c
index 6c83fe9..4424c5e 100644
--- a/misc/partinfo.c
+++ b/misc/partinfo.c
@@ -23,12 +23,6 @@
#define BLKGETSIZE _IO(0x12,96) /* return device size */
#endif
-void print_error(char *operation, int error, char *device)
-{
- fprintf(stderr, _("%s failed for %s: %s\n"), operation, device,
- strerror(error));
-}
-
int main(int argc, char **argv)
{
struct hd_geometry loc;
@@ -52,24 +46,27 @@
fd = open(argv[i], O_RDONLY);
if (fd < 0) {
- print_error(_("open"), errno, argv[i]);
+ fprintf(stderr, _("Cannot open %s: %s"),
+ argv[i], strerror(errno));
continue;
}
if (ioctl(fd, HDIO_GETGEO, &loc) < 0) {
- print_error(_("HDIO_GETGEO ioctl"), errno, argv[i]);
+ fprintf(stderr, _("Cannot get geometry of %s: %s"),
+ argv[i], strerror(errno));
close(fd);
continue;
}
if (ioctl(fd, BLKGETSIZE, &size) < 0) {
- print_error(_("BLKGETSIZE ioctl"), errno, argv[i]);
+ fprintf(stderr, _("Cannot get size of %s: %s"),
+ argv[i], strerror(errno));
close(fd);
continue;
}
- printf("%s: h=%3d s=%3d c=%4d start=%8d size=%8lu end=%8d\n",
+ printf(_("%s: h=%3d s=%3d c=%4d start=%8d size=%8lu end=%8d\n"),
argv[i],
loc.heads, (int)loc.sectors, loc.cylinders,
(int)loc.start, size, (int) loc.start + size -1);