From d8eea993d770f6565763602567a4bf216a36df53 Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Sun, 17 Apr 2011 13:40:37 +0300 Subject: [PATCH] kvm tools: Cleanup qcow1_read_sector() function Fix formatting issues and rename 'length' variable to 'nr_read'. Signed-off-by: Pekka Enberg --- qcow.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/qcow.c b/qcow.c index e5eb12c..4b7384a 100644 --- a/qcow.c +++ b/qcow.c @@ -107,22 +107,22 @@ static int qcow1_read_sector(struct disk_image *self, uint64_t sector, struct qcow1_header *header = q->header; char *buf = dst; u64 offset; - u32 length; + u32 nr_read; u32 nr; - length = 0; - while (length < dst_len) { + nr_read = 0; + while (nr_read < dst_len) { offset = sector << SECTOR_SHIFT; if (offset >= header->size) goto out_error; - nr = qcow1_read_cluster(q, offset, buf, dst_len - length); + nr = qcow1_read_cluster(q, offset, buf, dst_len - nr_read); if (!nr) goto out_error; - length += nr; - buf += nr; - sector += (nr >> SECTOR_SHIFT); + nr_read += nr; + buf += nr; + sector += (nr >> SECTOR_SHIFT); } return 0; out_error: