textual: equalize four error messages with already existing ones

Signed-off-by: Benno Schulenberg <bensberg@justemail.net>

diff --git a/disk-utils/fsck.c b/disk-utils/fsck.c
index 00622c428f67c7e7c82c89654c7bb7afa83a5992..3084134586669e8f1d664aaf3ebdafedbe8e7b6c 100644 (file)
--- a/disk-utils/fsck.c
+++ b/disk-utils/fsck.c
@@ -713,7 +713,7 @@ static struct fsck_instance *wait_one(int flags)
                                warnx(_("wait: no more child process?!?"));
                                return NULL;
                        }
-                       warn(_("waidpid failed"));
+                       warn(_("waitpid failed"));
                        continue;
                }
                for (prev = 0, inst = instance_list;

diff --git a/libfdisk/src/dos.c b/libfdisk/src/dos.c
index 163a87b465207e9e823a077219311033130371f3..3aa40deeae959e84e3ecf008aea16e81f581cdae 100644 (file)
--- a/libfdisk/src/dos.c
+++ b/libfdisk/src/dos.c
@@ -808,8 +808,8 @@ static int add_partition(struct fdisk_context *cxt, int n, struct fdisk_parttype
        sys = t ? t->type : MBR_LINUX_DATA_PARTITION;
 
        if (p && p->sys_ind) {
-               fdisk_warnx(cxt, _("Partition %d is already defined.  Delete "
-                        "it before re-adding it."), n + 1);
+               fdisk_warnx(cxt, _("Partition %zd is already defined.  "
+                                  "Delete it before re-adding it."), n + 1);
                return -EINVAL;
        }
        fill_bounds(cxt, first, last);

diff --git a/libfdisk/src/gpt.c b/libfdisk/src/gpt.c
index 9536eb3832299ff7b251bdedbb145268741361a3..0692d158eae2d59c69999e006a96665479b6955c 100644 (file)
--- a/libfdisk/src/gpt.c
+++ b/libfdisk/src/gpt.c
@@ -1658,8 +1658,8 @@ static int gpt_add_partition(
        ents = gpt->ents;
 
        if (!partition_unused(&ents[partnum])) {
-               fdisk_warnx(cxt, _("Partition %zd is already defined. "
-                        "Delete it before re-adding it."), partnum +1);
+               fdisk_warnx(cxt, _("Partition %zd is already defined.  "
+                                  "Delete it before re-adding it."), partnum +1);
                return -EINVAL;
        }
        if (le32_to_cpu(pheader->npartition_entries) ==

diff --git a/libfdisk/src/sgi.c b/libfdisk/src/sgi.c
index 96e84f21c27f007ff58bc053dfbc937e697a3669..ce23675956f3169e7e1d6d854195dabf38d82959 100644 (file)
--- a/libfdisk/src/sgi.c
+++ b/libfdisk/src/sgi.c
@@ -977,7 +977,7 @@ static int sgi_create_disklabel(struct fdisk_context *cxt)
                } else {
                        /* otherwise print error and use truncated version */
                        fdisk_warnx(cxt,
-                               _("Warning:  BLKGETSIZE ioctl failed on %s. "
+                               _("BLKGETSIZE ioctl failed on %s. "
                                  "Using geometry cylinder value of %llu. "
                                  "This value may be truncated for devices "
                                  "> 33.8 GB."), cxt->dev_path, cxt->geom.cylinders);