tests: don't use errno in output

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

diff --git a/libfdisk/samples/mkpart-fullspec.c b/libfdisk/samples/mkpart-fullspec.c
index 2096181c79fc1d267730523ba6964c0fa317fba8..041bf2cec0622fded1ee3e71aa4c1c23d7a778e4 100644 (file)
--- a/libfdisk/samples/mkpart-fullspec.c
+++ b/libfdisk/samples/mkpart-fullspec.c
@@ -153,7 +153,7 @@ int main(int argc, char *argv[])
                rc = fdisk_add_partition(cxt, pa, NULL);
                if (rc) {
                        errno = -rc;
-                       err(EXIT_FAILURE, "failed to add #%d partition", partno);
+                       errx(EXIT_FAILURE, "failed to add #%d partition", partno);
                }
 
                fdisk_reset_partition(pa);

diff --git a/libfdisk/samples/mkpart.c b/libfdisk/samples/mkpart.c
index 8498cb9065ea32d1392b10f33a1bf48a65709260..7871015cf845e0c9045d3f15201717a539c2e91d 100644 (file)
--- a/libfdisk/samples/mkpart.c
+++ b/libfdisk/samples/mkpart.c
@@ -170,7 +170,7 @@ int main(int argc, char *argv[])
                rc = fdisk_add_partition(cxt, pa, NULL);
                if (rc) {
                        errno = -rc;
-                       err(EXIT_FAILURE, "failed to add #%d partition", n + 1);
+                       errx(EXIT_FAILURE, "failed to add #%d partition", n + 1);
                }
 
                fdisk_reset_partition(pa);

diff --git a/tests/expected/libfdisk/mkpart-full-gpt-err-overlap b/tests/expected/libfdisk/mkpart-full-gpt-err-overlap
index aea49cd5a22becdfdc8aacc703f7911877a0355d..6733392309e77fad2e7eb71725508844abfa3121 100644 (file)
--- a/tests/expected/libfdisk/mkpart-full-gpt-err-overlap
+++ b/tests/expected/libfdisk/mkpart-full-gpt-err-overlap
@@ -7,7 +7,7 @@ Created a new <removed>.
 Created a new <removed>.
 Created a new <removed>.
 Sector 5000 already used.
-sample-fdisk-mkpart-fullspec: failed to add #4 partition: Numerical result out of range
+sample-fdisk-mkpart-fullspec: failed to add #4 partition
 Disk <removed>: 15 MiB, 15728640 bytes, 30720 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes

diff --git a/tests/expected/libfdisk/mkpart-full-mbr-err-logical b/tests/expected/libfdisk/mkpart-full-mbr-err-logical
index b2249c86784190530ef32a4a59474db177c89645..c2c0b0df620c355ec99fc57f10c7f01188381d84 100644 (file)
--- a/tests/expected/libfdisk/mkpart-full-mbr-err-logical
+++ b/tests/expected/libfdisk/mkpart-full-mbr-err-logical
@@ -4,7 +4,7 @@ Requested partition: <partno=2,start=6144,size=2048>
 Requested partition: <partno=3,start=8192,size=22528>
 Requested partition: <partno=4,start=10240,size=2048>
 Requested partition: <partno=5,start=4096,size=2048>
-sample-fdisk-mkpart-fullspec: failed to add #6 partition: Invalid argument
+sample-fdisk-mkpart-fullspec: failed to add #6 partition
 Created a new <removed>.
 Created a new <removed>.
 Created a new <removed>.

diff --git a/tests/expected/libfdisk/mkpart-full-mbr-err-nospace b/tests/expected/libfdisk/mkpart-full-mbr-err-nospace
index cc243befb9943b6470f9b93704f371bfda04b51c..d7a006569972fa7ff966957b77dd57797b645ab5 100644 (file)
--- a/tests/expected/libfdisk/mkpart-full-mbr-err-nospace
+++ b/tests/expected/libfdisk/mkpart-full-mbr-err-nospace
@@ -5,7 +5,7 @@ Created a new <removed>.
 Created a new <removed>.
 Created a new <removed>.
 Start sector 4096 out of range.
-sample-fdisk-mkpart-fullspec: failed to add #3 partition: Numerical result out of range
+sample-fdisk-mkpart-fullspec: failed to add #3 partition
 Disk <removed>: 15 MiB, 15728640 bytes, 30720 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes

diff --git a/tests/expected/libfdisk/mkpart-full-mbr-err-primary b/tests/expected/libfdisk/mkpart-full-mbr-err-primary
index aeb4bc7d8dd1b27ba6364a31fd85fba7de9b869e..1142f6531220c087381f75b76ab6b69d5e39b4ec 100644 (file)
--- a/tests/expected/libfdisk/mkpart-full-mbr-err-primary
+++ b/tests/expected/libfdisk/mkpart-full-mbr-err-primary
@@ -5,7 +5,7 @@ Created a new <removed>.
 Created a new <removed>.
 Created a new <removed>.
 Extended partition does not exists. Failed to add logical partition.
-sample-fdisk-mkpart-fullspec: failed to add #7 partition: Invalid argument
+sample-fdisk-mkpart-fullspec: failed to add #7 partition
 Disk <removed>: 15 MiB, 15728640 bytes, 30720 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes