Rockbox.org home
release
dev builds
extras
themes manual
wiki
device status forums
mailing lists
IRC bugs
patches
dev guide



Rockbox mail archive

Subject: Re: Buschel: r29190 - in trunk: firmware/target/arm/as3525 firmware/target/arm/tms320dm320 utils/zenutils/libraries/zlib123/zlib

Re: Buschel: r29190 - in trunk: firmware/target/arm/as3525 firmware/target/arm/tms320dm320 utils/zenutils/libraries/zlib123/zlib

From: Maurus Cuelenaere <mcuelenaere_at_gmail.com>
Date: Wed, 02 Feb 2011 19:08:43 +0100

Op 02-02-11 18:55, mailer_at_svn.rockbox.org schreef:
> Date: 2011-02-02 18:55:04 +0100 (Wed, 02 Feb 2011)
> New Revision: 29190
>
> Log Message:
> Fix red. Replace remaining MEM's mit MEMORYSIZE.
>
> Modified:
> trunk/firmware/target/arm/as3525/memory-init.S
> trunk/firmware/target/arm/tms320dm320/system-dm320.c
> trunk/utils/zenutils/libraries/zlib123/zlib/inflate.c
[snip]
> Modified: trunk/utils/zenutils/libraries/zlib123/zlib/inflate.c
> ===================================================================
> --- trunk/utils/zenutils/libraries/zlib123/zlib/inflate.c 2011-02-02 17:43:32 UTC (rev 29189)
> +++ trunk/utils/zenutils/libraries/zlib123/zlib/inflate.c 2011-02-02 17:55:04 UTC (rev 29190)
> @@ -1134,7 +1134,7 @@
> RESTORE();
> if (state->wsize || (state->mode< CHECK&& out != strm->avail_out))
> if (updatewindow(strm, out)) {
> - state->mode = MEM;
> + state->mode = MEMORYSIZE;
> return Z_MEM_ERROR;
> }
> in -= strm->avail_in;
> @@ -1190,7 +1190,7 @@
>
> /* copy dictionary to window */
> if (updatewindow(strm, strm->avail_out)) {
> - state->mode = MEM;
> + state->mode = MEMORYSIZE;
> return Z_MEM_ERROR;
> }
> if (dictLength> state->wsize) {
>

This doesn't look correct, I think you should revert this hunk (also you did not
replace all instances of MEM -> MEMORYSIZE in this file).

-- 
Maurus Cuelenaere
Received on 2011-02-02

Page was last modified "Jan 10 2012" The Rockbox Crew
aaa