Commit 51a505d7 authored Sep 22, 2007 by Milton Miller Committed by Paul Mackerras Oct 03, 2007

[POWERPC] boot: Simplify gunzip_finish



Call gunzip_partial to calculate the remaining length and copy the
data to the user buffer.  This makes it shorter and reduces
duplication.

Signed-off-by: Milton Miller <miltonm@bga.com>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>

parent e47654d0

arch/powerpc/boot/gunzip_util.c

+2 −5

Original line number	Diff line number	Diff line
		@@ -194,13 +194,10 @@ int gunzip_finish(struct gunzip_state state, void dst, int dstlen)
		{
		int len;

		if (state->s.workspace) {
		len = gunzip_partial(state, dst, dstlen);

		if (state->s.workspace) {
		zlib_inflateEnd(&state->s);
		} else {
		/* uncompressed image */
		len = min(state->s.avail_in, (unsigned)dstlen);
		memcpy(dst, state->s.next_in, len);
		}

		return len;