11c11
< Copyright (C) 1996-2002 Julian R Seward. All rights reserved.
---
> Copyright (C) 1996-2005 Julian R Seward. All rights reserved.
45c45
< jseward@acm.org
---
> jseward@bzip.org
91c91
< "Please report it to me at: jseward@acm.org. If this happened\n"
---
> "Please report it to me at: jseward@bzip.org. If this happened\n"
96c96
< "quality software. Thanks. Julian Seward, 30 December 2001.\n\n",
---
> "quality software. Thanks. Julian Seward, 15 February 2005.\n\n",
576a577,579
> /* Return True iff data corruption is discovered.
> Returns False if there is no problem.
> */
578c581
< void unRLE_obuf_to_output_FAST ( DState* s )
---
> Bool unRLE_obuf_to_output_FAST ( DState* s )
587c590
< if (s->strm->avail_out == 0) return;
---
> if (s->strm->avail_out == 0) return False;
597c600
<
---
>
599c602
< if (s->nblock_used == s->save_nblock+1) return;
---
> if (s->nblock_used == s->save_nblock+1) return False;
600a604,606
> /* Only caused by corrupt data stream? */
> if (s->nblock_used > s->save_nblock+1)
> return True;
669a676,679
> /* Only caused by corrupt data stream? */
> if (c_nblock_used > s_save_nblockPP)
> return True;
>
714a725
> return False;
734a746,748
> /* Return True iff data corruption is discovered.
> Returns False if there is no problem.
> */
736c750
< void unRLE_obuf_to_output_SMALL ( DState* s )
---
> Bool unRLE_obuf_to_output_SMALL ( DState* s )
745c759
< if (s->strm->avail_out == 0) return;
---
> if (s->strm->avail_out == 0) return False;
757,758c771,775
< if (s->nblock_used == s->save_nblock+1) return;
<
---
> if (s->nblock_used == s->save_nblock+1) return False;
>
> /* Only caused by corrupt data stream? */
> if (s->nblock_used > s->save_nblock+1)
> return True;
791c808
< if (s->strm->avail_out == 0) return;
---
> if (s->strm->avail_out == 0) return False;
803c820,824
< if (s->nblock_used == s->save_nblock+1) return;
---
> if (s->nblock_used == s->save_nblock+1) return False;
>
> /* Only caused by corrupt data stream? */
> if (s->nblock_used > s->save_nblock+1)
> return True;
832a854
> Bool corrupt;
843,844c865,867
< unRLE_obuf_to_output_SMALL ( s ); else
< unRLE_obuf_to_output_FAST ( s );
---
> corrupt = unRLE_obuf_to_output_SMALL ( s ); else
> corrupt = unRLE_obuf_to_output_FAST ( s );
> if (corrupt) return BZ_DATA_ERROR;
848c871
< VPrintf2 ( " {0x%x, 0x%x}", s->storedBlockCRC,
---
> VPrintf2 ( " {0x%08x, 0x%08x}", s->storedBlockCRC,
866c889
< VPrintf2 ( "\n combined CRCs: stored = 0x%x, computed = 0x%x",
---
> VPrintf2 ( "\n combined CRCs: stored = 0x%08x, computed = 0x%08x",