From: Karel Zak <kzak@redhat.com>
Date: Fri, 4 Oct 2013 10:07:12 +0000 (+0200)
Subject: libfdisk: cleanup warning messages
X-Git-Tag: v2.24-rc2~56
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=77274f8842642b0885e17c64eb50f3e75cff67b6;p=thirdparty%2Futil-linux.git

libfdisk: cleanup warning messages

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

diff --git a/libfdisk/src/bsd.c b/libfdisk/src/bsd.c
index 19279ad934..3ea06e860c 100644
--- a/libfdisk/src/bsd.c
+++ b/libfdisk/src/bsd.c
@@ -518,12 +518,12 @@ static int bsd_get_bootstrap(struct fdisk_context *cxt,
 	int fd;
 
 	if ((fd = open(path, O_RDONLY)) < 0) {
-		fdisk_warn(cxt, _("open failed %s"), path);
+		fdisk_warn(cxt, _("cannot open %s"), path);
 		return -errno;
 	}
 
 	if (read_all(fd, ptr, size) != size) {
-		fdisk_warn(cxt, _("read failed %s"), path);
+		fdisk_warn(cxt, _("cannot read %s"), path);
 		close(fd);
 		return -errno;
 	}
@@ -590,12 +590,12 @@ int fdisk_bsd_write_bootstrap(struct fdisk_context *cxt)
 	alpha_bootblock_checksum(l->bsdbuffer);
 #endif
 	if (lseek(cxt->dev_fd, (off_t) sector * DEFAULT_SECTOR_SIZE, SEEK_SET) == -1) {
-		fdisk_warn(cxt, _("seek failed %s"), cxt->dev_path);
+		fdisk_warn(cxt, _("seek on %s failed"), cxt->dev_path);
 		rc = -errno;
 		goto done;
 	}
 	if (write_all(cxt->dev_fd, l->bsdbuffer, BSD_BBSIZE)) {
-		fdisk_warn(cxt, _("write failed %s"), cxt->dev_path);
+		fdisk_warn(cxt, _("cannot write %s"), cxt->dev_path);
 		rc = -errno;
 		goto done;
 	}
@@ -758,11 +758,11 @@ static int bsd_write_disklabel(struct fdisk_context *cxt)
 	alpha_bootblock_checksum(l->bsdbuffer);
 #endif
 	if (lseek(cxt->dev_fd, offset, SEEK_SET) == -1) {
-		fdisk_warn(cxt, _("seek failed: %d"), cxt->dev_path);
+		fdisk_warn(cxt, _("seek on %s failed"), cxt->dev_path);
 		return -errno;
 	}
 	if (write_all(cxt->dev_fd, l->bsdbuffer, sizeof(l->bsdbuffer))) {
-		fdisk_warn(cxt, _("write failed: %d"), cxt->dev_path);
+		fdisk_warn(cxt, _("cannot write %s"), cxt->dev_path);
 		return -errno;
 	}
 	sync_disks(cxt);