[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 4/7] qemu-img: delete not used variable and an un
From: |
Reda Sallahi |
Subject: |
[Qemu-devel] [PATCH v2 4/7] qemu-img: delete not used variable and an unecessary check |
Date: |
Fri, 26 Aug 2016 11:16:40 +0200 |
block_count is not used in img_dd() and the C_SKIP check is unecessary so
this patch removes both of them.
Signed-off-by: Reda Sallahi <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
---
qemu-img.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index a4d0556..bd3e80d 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -4066,7 +4066,7 @@ static int img_dd(int argc, char **argv)
const char *fmt = NULL;
const char *out_filename;
int64_t size = 0, out_size = 0;
- int64_t block_count = 0, out_pos, in_pos, sparse_count = 0;
+ int64_t out_pos, in_pos, sparse_count = 0;
bool writethrough = false;
int flags = 0;
int ibsz = 0, obsz = 0, bsz;
@@ -4344,8 +4344,7 @@ static int img_dd(int argc, char **argv)
}
}
- if (dd.flags & C_SKIP && (in.offset > INT64_MAX / ibsz ||
- size < in.offset * ibsz)) {
+ if (in.offset > INT64_MAX / ibsz || size < in.offset * ibsz) {
/* We give a warning if the skip option is bigger than the input
* size and create an empty output disk image (i.e. like dd(1)).
*/
@@ -4357,7 +4356,7 @@ static int img_dd(int argc, char **argv)
in.buf = g_new(uint8_t, in.bsz);
- for (out_pos = out.offset * obsz; in_pos < size; block_count++) {
+ for (out_pos = out.offset * obsz; in_pos < size;) {
int in_ret, out_ret;
bsz = in.bsz;
--
2.9.3
- [Qemu-devel] [PATCH v2 0/7] qemu-img dd, Reda Sallahi, 2016/08/26
- [Qemu-devel] [PATCH v2 1/7] qemu-img: add seek option to dd, Reda Sallahi, 2016/08/26
- [Qemu-devel] [PATCH v2 3/7] qemu-img: add more conv= conversions to dd, Reda Sallahi, 2016/08/26
- [Qemu-devel] [PATCH v2 2/7] qemu-img: add iflag and oflag options to dd, Reda Sallahi, 2016/08/26
- [Qemu-devel] [PATCH v2 7/7] qemu-img: add a test suite for the count option, Reda Sallahi, 2016/08/26
- [Qemu-devel] [PATCH v2 4/7] qemu-img: delete not used variable and an unecessary check,
Reda Sallahi <=
- [Qemu-devel] [PATCH v2 5/7] qemu-img: add status option to dd, Reda Sallahi, 2016/08/26
- [Qemu-devel] [PATCH v2 6/7] qemu-img: clean up dd documentation, Reda Sallahi, 2016/08/26