commit 8678d30300e9366bcbf74630f91f2fa472eaab23
author Phillip Lougher <phillip@squashfs.org.uk> Sun Mar 02 03:02:19 2014 +0000
committer Mohamad Ayyash <mkayyash@google.com> Mon Feb 23 12:36:16 2015 -0800
tree b0557393ceb3f34890cabf01e307ca68d2eedf6b
parent 5e4f0efb8dd485c5dbe0b9e569f462d69343fccf

mksquashfs: reader_read_file(), get rid of count

Get of rid of count now it is no longer used.

Signed-off-by: Phillip Lougher <phillip@squashfs.org.uk>

squashfs-tools/mksquashfs.c

diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c
index 5e050ae..ecaa3cf 100644
--- a/squashfs-tools/mksquashfs.c
+++ b/squashfs-tools/mksquashfs.c
@@ -2076,7 +2076,7 @@
 {
 	struct stat *buf = &dir_ent->inode->buf, buf2;
 	struct file_buffer *file_buffer;
-	int blocks, byte, count, expected, file, res;
+	int blocks, byte, expected, file, res;
 	long long bytes, read_size;
 	struct inode_info *inode = dir_ent->inode;
 
@@ -2086,7 +2086,6 @@
 	inode->read = TRUE;
 again:
 	bytes = 0;
-	count = 0;
 	file_buffer = NULL;
 	read_size = buf->st_size;
 	blocks = (read_size + block_size - 1) >> block_log;
@@ -2099,9 +2098,7 @@
 	}
 
 	do {
-		expected = read_size - ((long long) count * block_size) >
-			block_size ? block_size :
-			read_size - ((long long) count * block_size);
+		expected = blocks > 1 ? block_size : read_size % block_size;
 
 		if(file_buffer)
 			put_file_buffer(file_buffer);
@@ -2133,8 +2130,7 @@
 		file_buffer->fragment = FALSE;
 
 		bytes += byte;
-		count ++;
-	} while(count < blocks);
+	} while(-- blocks > 0);
 
 	if(read_size != bytes)
 		goto restat;