[POWERPC] mpc82xx: Add pq2fads board support.

[safe/jmp/linux-2.6] / arch / powerpc / boot / gunzip_util.c

diff --git a/arch/powerpc/boot/gunzip_util.c b/arch/powerpc/boot/gunzip_util.c
index f7c95f2..ef2aed0 100644 (file)
--- a/arch/powerpc/boot/gunzip_util.c
+++ b/arch/powerpc/boot/gunzip_util.c
@@ -52,18 +52,14 @@ void gunzip_start(struct gunzip_state *state, void *src, int srclen)
                int r, flags;
 
                state->s.workspace = state->scratch;
-               if (zlib_inflate_workspacesize() > sizeof(state->scratch)) {
-                       printf("insufficient scratch space for gunzip\n\r");
-                       exit();
-               }
+               if (zlib_inflate_workspacesize() > sizeof(state->scratch))
+                       fatal("insufficient scratch space for gunzip\n\r");
 
                /* skip header */
                hdrlen = 10;
                flags = hdr[3];
-               if (hdr[2] != Z_DEFLATED || (flags & RESERVED) != 0) {
-                       printf("bad gzipped data\n\r");
-                       exit();
-               }
+               if (hdr[2] != Z_DEFLATED || (flags & RESERVED) != 0)
+                       fatal("bad gzipped data\n\r");
                if ((flags & EXTRA_FIELD) != 0)
                        hdrlen = 12 + hdr[10] + (hdr[11] << 8);
                if ((flags & ORIG_NAME) != 0)
@@ -74,18 +70,15 @@ void gunzip_start(struct gunzip_state *state, void *src, int srclen)
                                ;
                if ((flags & HEAD_CRC) != 0)
                        hdrlen += 2;
-               if (hdrlen >= srclen) {
-                       printf("gunzip_start: ran out of data in header\n\r");
-                       exit();
-               }
+               if (hdrlen >= srclen)
+                       fatal("gunzip_start: ran out of data in header\n\r");
 
                r = zlib_inflateInit2(&state->s, -MAX_WBITS);
-               if (r != Z_OK) {
-                       printf("inflateInit2 returned %d\n\r", r);
-                       exit();
-               }
+               if (r != Z_OK)
+                       fatal("inflateInit2 returned %d\n\r", r);
        }
 
+       state->s.total_in = hdrlen;
        state->s.next_in = src + hdrlen;
        state->s.avail_in = srclen - hdrlen;
 }
@@ -117,10 +110,8 @@ int gunzip_partial(struct gunzip_state *state, void *dst, int dstlen)
                state->s.next_out = dst;
                state->s.avail_out = dstlen;
                r = zlib_inflate(&state->s, Z_FULL_FLUSH);
-               if (r != Z_OK && r != Z_STREAM_END) {
-                       printf("inflate returned %d msg: %s\n\r", r, state->s.msg);
-                       exit();
-               }
+               if (r != Z_OK && r != Z_STREAM_END)
+                       fatal("inflate returned %d msg: %s\n\r", r, state->s.msg);
                len = state->s.next_out - (unsigned char *)dst;
        } else {
                /* uncompressed image */
@@ -151,10 +142,9 @@ void gunzip_exactly(struct gunzip_state *state, void *dst, int dstlen)
        int len;
 
        len  = gunzip_partial(state, dst, dstlen);
-       if (len < dstlen) {
-               printf("gunzip_block: ran out of data\n\r");
-               exit();
-       }
+       if (len < dstlen)
+               fatal("\n\rgunzip_exactly: ran out of data!"
+                               " Wanted %d, got %d.\n\r", dstlen, len);
 }
 
 /**
@@ -204,13 +194,10 @@ int gunzip_finish(struct gunzip_state *state, void *dst, int dstlen)
 {
        int len;
 
+       len = gunzip_partial(state, dst, dstlen);
+
        if (state->s.workspace) {
-               len = gunzip_partial(state, dst, dstlen);
                zlib_inflateEnd(&state->s);
-       } else {
-               /* uncompressed image */
-               len = min(state->s.avail_in, (unsigned)dstlen);
-               memcpy(dst, state->s.next_in, len);
        }
 
        return len;