Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 170cf021 authored by Phillip Lougher's avatar Phillip Lougher
Browse files

Squashfs: remove unnecessary variable in zlib_wrapper 



Get rid of unnecessary bytes variable, and remove redundant
initialisation of zlib_err.

Signed-off-by: default avatarPhillip Lougher <phillip@lougher.demon.co.uk>
parent 7a43ae52

fs/squashfs/zlib_wrapper.c

+4 −5
Original line number Original line Diff line number Diff line
@@ -66,8 +66,8 @@ static int zlib_uncompress(struct squashfs_sb_info *msblk, void **buffer, 
	struct buffer_head **bh, int b, int offset, int length, int srclength,

	struct buffer_head **bh, int b, int offset, int length, int srclength,

	int pages)

	int pages)

{

{

	int zlib_err = 0, zlib_init = 0;

	int zlib_err, zlib_init = 0;

	int avail, bytes, k = 0, page = 0;

	int k = 0, page = 0;

	z_stream *stream = msblk->stream;

	z_stream *stream = msblk->stream;





	mutex_lock(&msblk->read_data_mutex);

	mutex_lock(&msblk->read_data_mutex);
@@ -75,11 +75,10 @@ static int zlib_uncompress(struct squashfs_sb_info *msblk, void **buffer, 
	stream->avail_out = 0;

	stream->avail_out = 0;

	stream->avail_in = 0;

	stream->avail_in = 0;





	bytes = length;

	do {

	do {

		if (stream->avail_in == 0 && k < b) {

		if (stream->avail_in == 0 && k < b) {

			avail = min(bytes, msblk->devblksize - offset);

			int avail = min(length, msblk->devblksize - offset);

			bytes -= avail;

			length -= avail;

			wait_on_buffer(bh[k]);

			wait_on_buffer(bh[k]);

			if (!buffer_uptodate(bh[k]))

			if (!buffer_uptodate(bh[k]))

				goto release_mutex;

				goto release_mutex;