aboutsummaryrefslogtreecommitdiffstats
path: root/disk-utils/sfdisk.c
diff options
context:
space:
mode:
authorKarel Zak <kzak@redhat.com>2022-08-11 13:04:58 +0200
committerKarel Zak <kzak@redhat.com>2022-08-11 13:04:58 +0200
commita8bc53cbd1b88b709b645790a041864db75ccc56 (patch)
tree4d137938170047dc9e5fc7dd0c11a2acb57a236a /disk-utils/sfdisk.c
parentadc72421f4db93bc9cd932bac2b0be8197a1d64f (diff)
downloadutil-linux-a8bc53cbd1b88b709b645790a041864db75ccc56.tar.gz
sfdisk: improve code readability for coverity scan
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'disk-utils/sfdisk.c')
-rw-r--r--disk-utils/sfdisk.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/disk-utils/sfdisk.c b/disk-utils/sfdisk.c
index 38c7b17986..112bc7c61c 100644
--- a/disk-utils/sfdisk.c
+++ b/disk-utils/sfdisk.c
@@ -435,7 +435,6 @@ static int move_partition_data(struct sfdisk *sf, size_t partno, struct fdisk_pa
from = fdisk_partition_get_start(orig_pa);
to = fdisk_partition_get_start(pa);
-
if ((to >= from && from + nsectors >= to) ||
(from >= to && to + nsectors >= from)) {
/* source and target overlay, check if we need to copy
@@ -462,7 +461,8 @@ static int move_partition_data(struct sfdisk *sf, size_t partno, struct fdisk_pa
#if defined(POSIX_FADV_SEQUENTIAL) && defined(HAVE_POSIX_FADVISE)
if (!backward)
- posix_fadvise(fd, from * ss, nsectors * ss, POSIX_FADV_SEQUENTIAL);
+ ignore_result( posix_fadvise(fd, from * ss,
+ nsectors * ss, POSIX_FADV_SEQUENTIAL) );
#endif
devname = fdisk_partname(fdisk_get_devname(sf->cxt), partno+1);
if (sf->move_typescript)
@@ -608,7 +608,7 @@ next:
src += step_bytes, dst += step_bytes;
}
- if (progress) {
+ if (progress && nsectors) {
int x = get_terminal_width(80);
for (; x > 0; x--)
fputc(' ', stdout);