Fix gunzip to work for any gzipped uImage size Signed-off-by: Catalin Radu <[email protected]>
PATCH 1/1 Fix gunzip to work for any gzipped uImage size Signed-off-by: Catalin Radu <[email protected]>
--- lib/gunzip.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-)
lib/gunzip.c +10 -6
@@ -106,12 +106,16 @@ int zunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp, s.avail_in = *lenp - offset; s.next_out = dst; s.avail_out = dstlen; - r =inflate (&s,Z_FINISH ); -if ((r !=Z_STREAM_END ) && (stoponerr==1 )) { -printf ("Error: inflate() returned %d\n" , r); -inflateEnd (&s); -return (-1 ); - } +do { + r =inflate (&s,Z_FINISH ); +if ((r !=Z_STREAM_END ) && (r !=Z_BUF_ERROR ) && (stoponerr==1 )) { +printf ("Error: inflate() returned %d\n" , r); +inflateEnd (&s); +return (-1 ); + } + s.avail_in = *lenp - offset - (int )(s.next_out - (unsigned char *)dst); + s.avail_out = dstlen; + }while (r ==Z_BUF_ERROR ); *lenp = s.next_out - (unsigned char *) dst;inflateEnd (&s);
Signature · 1 line
1.6.3.3
PATCH 1/1 Fix gunzip to work for any gzipped uImage size Signed-off-by: Catalin Radu <[email protected]>
Hello.
Quoted 14 lines · Catalin Radu
lib/gunzip.c +0
-6@@ -106,12 +106,16 @@ int zunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp, s.avail_in = *lenp - offset; s.next_out = dst; s.avail_out = dstlen; - r =inflate (&s,Z_FINISH ); -if ((r !=Z_STREAM_END )&& (stoponerr==1 )) { -printf ("Error: inflate() returned %d\n" , r); -inflateEnd (&s); -return (-1 ); - }
lib/gunzip.c int zunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp, · line 118
Quoted 10 lines
lib/gunzip.c +10
-0+do { + r =inflate (&s,Z_FINISH ); +if ((r !=Z_STREAM_END )&& (r !=Z_BUF_ERROR )&& (stoponerr==1 )) { +printf ("Error: inflate() returned %d\n" , r); +inflateEnd (&s); +return (-1 ); + } + s.avail_in = *lenp - offset - (int )(s.next_out - (unsigned char *)dst); + s.avail_out = dstlen; + }while (r ==Z_BUF_ERROR );
Don't use spaces for indenting, only tabs.
WBR, Sergei
PATCH 1/1 Fix gunzip to work for any gzipped uImage size Signed-off-by: Catalin Radu <[email protected]>
In reply to Catalin RaduYour signoff line got "pasted" to the subject.
WBR, Sergei
PATCH 1/1 Fix gunzip to work for any gzipped uImage size Signed-off-by: Catalin Radu <[email protected]>
In reply to Catalin RaduDear Catalin Radu,
Quoted 3 lines · In message <[email protected]> you…
--- lib/gunzip.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-)
Please resubmit after cleaning up as requested by Sergei!
Best regards,
Wolfgang Denk
Signature · 7 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de Niklaus Wirth has lamented that, whereas Europeans pronounce his name correctly (Ni-klows Virt), Americans invariably mangle it into (Nick-les Worth). Which is to say that Europeans call him by name, but Americans call him by value.
PATCH 1/1 Fix gunzip to work for any gzipped uImage size Signed-off-by: Catalin Radu <[email protected]>
In reply to Catalin RaduDear Catalin Radu,
Quoted 3 lines · In message <[email protected]> you…
--- lib/gunzip.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-)
Oops. Please ignore me.
Or rather: Next time when posting a follow up patch please make sure to add proper thread information, and to mark the followup as a resubmit; see
http://www.denx.de/wiki/view/U-Boot/Patches#Sending_updated_patch_versions
Thanks.
Best regards,
Wolfgang Denk
Signature · 5 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
It is dangerous to be sincere unless you are also stupid.
- George Bernard Shaw