diff for duplicates of <20090120163957.GA21339@alice> diff --git a/a/1.txt b/N1/1.txt index 669c2c0..20fa17e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,9 +1,9 @@ -* J=C3=B6rn Engel (joern@logfs.org) wrote: +* Jörn Engel (joern@logfs.org) wrote: > On Fri, 16 January 2009 16:07:00 -0700, Tom Rini wrote: -> >=20 +> > > > Sounds like a plan to me, except maybe zlib_inflate_unsafe() and a > > comment above the wrapper saying what/why is going on? ->=20 +> > Eric, will you do the honors? Since you did all the hard work before, > you derserve the fame as well. :) @@ -18,25 +18,23 @@ zlib_inflate_usafe() for those and adds a check for the rest Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> ---- linux/arch/powerpc/boot/gunzip_util.c.orig 2009-01-20 10:23:11.00000000= -0 +0100 -+++ linux/arch/powerpc/boot/gunzip_util.c 2009-01-20 10:23:31.000000000 +01= -00 +--- linux/arch/powerpc/boot/gunzip_util.c.orig 2009-01-20 10:23:11.000000000 +0100 ++++ linux/arch/powerpc/boot/gunzip_util.c 2009-01-20 10:23:31.000000000 +0100 @@ -109,7 +109,7 @@ int gunzip_partial(struct gunzip_state * -=20 - state->s.next_out =3D dst; - state->s.avail_out =3D dstlen; -- r =3D zlib_inflate(&state->s, Z_FULL_FLUSH); -+ r =3D zlib_inflate_unsafe(&state->s, Z_FULL_FLUSH); - if (r !=3D Z_OK && r !=3D Z_STREAM_END) + + state->s.next_out = dst; + state->s.avail_out = dstlen; +- r = zlib_inflate(&state->s, Z_FULL_FLUSH); ++ r = zlib_inflate_unsafe(&state->s, Z_FULL_FLUSH); + if (r != Z_OK && r != Z_STREAM_END) fatal("inflate returned %d msg: %s\n\r", r, state->s.msg); - len =3D state->s.next_out - (unsigned char *)dst; + len = state->s.next_out - (unsigned char *)dst; --- linux/include/linux/zlib.h.orig 2009-01-20 10:11:33.000000000 +0100 +++ linux/include/linux/zlib.h 2009-01-20 10:19:56.000000000 +0100 @@ -329,7 +329,23 @@ extern int zlib_inflateInit (z_streamp s */ -=20 -=20 + + -extern int zlib_inflate (z_streamp strm, int flush); +extern int __zlib_inflate (z_streamp strm, int flush, int check_out); +/* @@ -58,42 +56,42 @@ Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> /* inflate decompresses as much data as possible, and stops when the input buffer becomes empty or the output buffer becomes full. It may introduce ---- linux/lib/zlib_inflate/inflate_syms.c.orig 2009-01-20 10:22:21.00000000= -0 +0100 -+++ linux/lib/zlib_inflate/inflate_syms.c 2009-01-20 10:22:32.000000000 +01= -00 +--- linux/lib/zlib_inflate/inflate_syms.c.orig 2009-01-20 10:22:21.000000000 +0100 ++++ linux/lib/zlib_inflate/inflate_syms.c 2009-01-20 10:22:32.000000000 +0100 @@ -11,7 +11,7 @@ #include <linux/zlib.h> -=20 + EXPORT_SYMBOL(zlib_inflate_workspacesize); -EXPORT_SYMBOL(zlib_inflate); +EXPORT_SYMBOL(__zlib_inflate); EXPORT_SYMBOL(zlib_inflateInit2); EXPORT_SYMBOL(zlib_inflateEnd); EXPORT_SYMBOL(zlib_inflateReset); ---- linux/lib/zlib_inflate/inflate.c.orig 2009-01-20 10:20:14.000000000 +01= -00 +--- linux/lib/zlib_inflate/inflate.c.orig 2009-01-20 10:20:14.000000000 +0100 +++ linux/lib/zlib_inflate/inflate.c 2009-01-20 10:22:03.000000000 +0100 @@ -329,7 +329,7 @@ static int zlib_inflateSyncPacket(z_stre will return Z_BUF_ERROR if it has not reached the end of the stream. */ -=20 + -int zlib_inflate(z_streamp strm, int flush) +int __zlib_inflate(z_streamp strm, int flush, int check_out) { struct inflate_state *state; const unsigned char *next; /* next input */ @@ -347,8 +347,10 @@ int zlib_inflate(z_streamp strm, int flu - static const unsigned short order[19] =3D /* permutation of code lengt= -hs */ + static const unsigned short order[19] = /* permutation of code lengths */ {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}; -=20 -- /* Do not check for strm->next_out =3D=3D NULL here as ppc zImage -- inflates to strm->next_out =3D 0 */ + +- /* Do not check for strm->next_out == NULL here as ppc zImage +- inflates to strm->next_out = 0 */ + /* We only check strm->next_out if the callee requests it, + since ppc extracts the ppc zImage to 0 */ + if (check_out && !strm->next_out) + return Z_STREAM_ERROR; -=20 - if (strm =3D=3D NULL || strm->state =3D=3D NULL || - (strm->next_in =3D=3D NULL && strm->avail_in !=3D 0)) + + if (strm == NULL || strm->state == NULL || + (strm->next_in == NULL && strm->avail_in != 0)) +-- +To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index 82aa5d0..e4853fa 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -8,19 +8,20 @@ "Date\0Tue, 20 Jan 2009 17:47:14 +0100\0" "To\0J\303\266rn Engel <joern@logfs.org>\0" "Cc\0Tom Rini <trini@kernel.crashing.org>" - chris@zankel.net phillip@lougher.demon.co.uk - linuxppc-dev@ozlabs.org + linux-fsdevel@vger.kernel.org + jacmet@sunsite.dk rpurdie@rpsys.net - " linux-fsdevel@vger.kernel.org\0" + linuxppc-dev@ozlabs.org + " chris@zankel.net\0" "\00:1\0" "b\0" - "* J=C3=B6rn Engel (joern@logfs.org) wrote:\n" + "* J\303\266rn Engel (joern@logfs.org) wrote:\n" "> On Fri, 16 January 2009 16:07:00 -0700, Tom Rini wrote:\n" - "> >=20\n" + "> > \n" "> > Sounds like a plan to me, except maybe zlib_inflate_unsafe() and a\n" "> > comment above the wrapper saying what/why is going on?\n" - ">=20\n" + "> \n" "> Eric, will you do the honors? Since you did all the hard work before,\n" "> you derserve the fame as well. :)\n" "\n" @@ -35,25 +36,23 @@ "\n" "Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>\n" "\n" - "--- linux/arch/powerpc/boot/gunzip_util.c.orig\t2009-01-20 10:23:11.00000000=\n" - "0 +0100\n" - "+++ linux/arch/powerpc/boot/gunzip_util.c\t2009-01-20 10:23:31.000000000 +01=\n" - "00\n" + "--- linux/arch/powerpc/boot/gunzip_util.c.orig\t2009-01-20 10:23:11.000000000 +0100\n" + "+++ linux/arch/powerpc/boot/gunzip_util.c\t2009-01-20 10:23:31.000000000 +0100\n" "@@ -109,7 +109,7 @@ int gunzip_partial(struct gunzip_state *\n" - "=20\n" - " \t\tstate->s.next_out =3D dst;\n" - " \t\tstate->s.avail_out =3D dstlen;\n" - "-\t\tr =3D zlib_inflate(&state->s, Z_FULL_FLUSH);\n" - "+\t\tr =3D zlib_inflate_unsafe(&state->s, Z_FULL_FLUSH);\n" - " \t\tif (r !=3D Z_OK && r !=3D Z_STREAM_END)\n" + " \n" + " \t\tstate->s.next_out = dst;\n" + " \t\tstate->s.avail_out = dstlen;\n" + "-\t\tr = zlib_inflate(&state->s, Z_FULL_FLUSH);\n" + "+\t\tr = zlib_inflate_unsafe(&state->s, Z_FULL_FLUSH);\n" + " \t\tif (r != Z_OK && r != Z_STREAM_END)\n" " \t\t\tfatal(\"inflate returned %d msg: %s\\n\\r\", r, state->s.msg);\n" - " \t\tlen =3D state->s.next_out - (unsigned char *)dst;\n" + " \t\tlen = state->s.next_out - (unsigned char *)dst;\n" "--- linux/include/linux/zlib.h.orig\t2009-01-20 10:11:33.000000000 +0100\n" "+++ linux/include/linux/zlib.h\t2009-01-20 10:19:56.000000000 +0100\n" "@@ -329,7 +329,23 @@ extern int zlib_inflateInit (z_streamp s\n" " */\n" - "=20\n" - "=20\n" + " \n" + " \n" "-extern int zlib_inflate (z_streamp strm, int flush);\n" "+extern int __zlib_inflate (z_streamp strm, int flush, int check_out);\n" "+/*\n" @@ -75,44 +74,44 @@ " /*\n" " inflate decompresses as much data as possible, and stops when the input\n" " buffer becomes empty or the output buffer becomes full. It may introduce\n" - "--- linux/lib/zlib_inflate/inflate_syms.c.orig\t2009-01-20 10:22:21.00000000=\n" - "0 +0100\n" - "+++ linux/lib/zlib_inflate/inflate_syms.c\t2009-01-20 10:22:32.000000000 +01=\n" - "00\n" + "--- linux/lib/zlib_inflate/inflate_syms.c.orig\t2009-01-20 10:22:21.000000000 +0100\n" + "+++ linux/lib/zlib_inflate/inflate_syms.c\t2009-01-20 10:22:32.000000000 +0100\n" "@@ -11,7 +11,7 @@\n" " #include <linux/zlib.h>\n" - "=20\n" + " \n" " EXPORT_SYMBOL(zlib_inflate_workspacesize);\n" "-EXPORT_SYMBOL(zlib_inflate);\n" "+EXPORT_SYMBOL(__zlib_inflate);\n" " EXPORT_SYMBOL(zlib_inflateInit2);\n" " EXPORT_SYMBOL(zlib_inflateEnd);\n" " EXPORT_SYMBOL(zlib_inflateReset);\n" - "--- linux/lib/zlib_inflate/inflate.c.orig\t2009-01-20 10:20:14.000000000 +01=\n" - "00\n" + "--- linux/lib/zlib_inflate/inflate.c.orig\t2009-01-20 10:20:14.000000000 +0100\n" "+++ linux/lib/zlib_inflate/inflate.c\t2009-01-20 10:22:03.000000000 +0100\n" "@@ -329,7 +329,7 @@ static int zlib_inflateSyncPacket(z_stre\n" " will return Z_BUF_ERROR if it has not reached the end of the stream.\n" " */\n" - "=20\n" + " \n" "-int zlib_inflate(z_streamp strm, int flush)\n" "+int __zlib_inflate(z_streamp strm, int flush, int check_out)\n" " {\n" " struct inflate_state *state;\n" " const unsigned char *next; /* next input */\n" "@@ -347,8 +347,10 @@ int zlib_inflate(z_streamp strm, int flu\n" - " static const unsigned short order[19] =3D /* permutation of code lengt=\n" - "hs */\n" + " static const unsigned short order[19] = /* permutation of code lengths */\n" " {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};\n" - "=20\n" - "- /* Do not check for strm->next_out =3D=3D NULL here as ppc zImage\n" - "- inflates to strm->next_out =3D 0 */\n" + " \n" + "- /* Do not check for strm->next_out == NULL here as ppc zImage\n" + "- inflates to strm->next_out = 0 */\n" "+ /* We only check strm->next_out if the callee requests it,\n" "+ since ppc extracts the ppc zImage to 0 */\n" "+ if (check_out && !strm->next_out)\n" "+ return Z_STREAM_ERROR;\n" - "=20\n" - " if (strm =3D=3D NULL || strm->state =3D=3D NULL ||\n" - (strm->next_in =3D=3D NULL && strm->avail_in !=3D 0)) + " \n" + " if (strm == NULL || strm->state == NULL ||\n" + " (strm->next_in == NULL && strm->avail_in != 0))\n" + "--\n" + "To unsubscribe from this list: send the line \"unsubscribe linux-fsdevel\" in\n" + "the body of a message to majordomo@vger.kernel.org\n" + More majordomo info at http://vger.kernel.org/majordomo-info.html -f61db6a4ad2146647e1a5a28c725a26824acbd735d763c48c02fa868c4b2ae67 +7109c3f82d1af1208f2794c2e0d821264e9b2272038bcc76e26666447620332c
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.