[4/7] qemu-img: delete not used variable and an unecessary check

Commit Message

Reda Sallahi Aug. 22, 2016, 7:55 a.m. UTC

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 <[e-mail]>
---
 qemu-img.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

Comments

Stefan Hajnoczi Aug. 22, 2016, 1:36 p.m. UTC | #1

On Mon, Aug 22, 2016 at 09:55:14AM +0200, Reda Sallahi wrote:
> 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 <[e-mail]>
> ---
>  qemu-img.c | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)

Reviewed-by: Stefan Hajnoczi <[e-mail]>

Patch

diff --git a/qemu-img.c b/qemu-img.c
index ae3828e..cf78dfe 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -4093,7 +4093,7 @@  static int img_dd(int argc, char **argv)
     const char *out_fmt = "raw";
     const char *fmt = NULL;
     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;
@@ -4373,8 +4373,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)).
          */
@@ -4386,7 +4385,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;