# HG changeset patch # User reimar # Date 1243769720 0 # Node ID 77fd9731dea587537549361786ec4c9cbb0f603c # Parent 18d149e8fc7fdede3ee06e05762d21d9b1084080 Merge variable declaration and initialization. diff -r 18d149e8fc7f -r 77fd9731dea5 lcldec.c --- a/lcldec.c Sun May 31 11:34:19 2009 +0000 +++ b/lcldec.c Sun May 31 11:35:20 2009 +0000 @@ -83,7 +83,6 @@ const unsigned char *srcptr_end = srcptr + srclen; unsigned mask = *srcptr++; unsigned maskbit = 0x80; - unsigned int ofs, cnt; while (srcptr < srcptr_end && destptr < destptr_end) { if (!(mask & maskbit)) { @@ -91,8 +90,8 @@ destptr += 4; srcptr += 4; } else { - ofs = bytestream_get_le16(&srcptr); - cnt = (ofs >> 11) + 1; + unsigned ofs = bytestream_get_le16(&srcptr); + unsigned cnt = (ofs >> 11) + 1; ofs &= 0x7ff; cnt *= 4; cnt = FFMIN(cnt, destptr_end - destptr);