adler32: whitespace cosmetics

Signed-off-by: Mans Rullgard <mans@mansr.com>
pull/2/head
Mans Rullgard 14 years ago
parent 81cc7d0bd1
commit bd55da1c08
  1. 28
      libavutil/adler32.c

@ -26,24 +26,28 @@
#define BASE 65521L /* largest prime smaller than 65536 */ #define BASE 65521L /* largest prime smaller than 65536 */
#define DO1(buf) {s1 += *buf++; s2 += s1;} #define DO1(buf) { s1 += *buf++; s2 += s1; }
#define DO4(buf) DO1(buf); DO1(buf); DO1(buf); DO1(buf); #define DO4(buf) DO1(buf); DO1(buf); DO1(buf); DO1(buf);
#define DO16(buf) DO4(buf); DO4(buf); DO4(buf); DO4(buf); #define DO16(buf) DO4(buf); DO4(buf); DO4(buf); DO4(buf);
unsigned long av_adler32_update(unsigned long adler, const uint8_t *buf, unsigned int len) unsigned long av_adler32_update(unsigned long adler, const uint8_t * buf,
unsigned int len)
{ {
unsigned long s1 = adler & 0xffff; unsigned long s1 = adler & 0xffff;
unsigned long s2 = adler >> 16; unsigned long s2 = adler >> 16;
while (len>0) { while (len > 0) {
#if CONFIG_SMALL #if CONFIG_SMALL
while(len>4 && s2 < (1U<<31)){ while (len > 4 && s2 < (1U << 31)) {
DO4(buf); len-=4; DO4(buf);
len -= 4;
}
#else #else
while(len>16 && s2 < (1U<<31)){ while (len > 16 && s2 < (1U << 31)) {
DO16(buf); len-=16; DO16(buf);
#endif len -= 16;
} }
#endif
DO1(buf); len--; DO1(buf); len--;
s1 %= BASE; s1 %= BASE;
s2 %= BASE; s2 %= BASE;
@ -61,9 +65,11 @@ int main(int argc, char **argv)
{ {
int i; int i;
char data[LEN]; char data[LEN];
av_log_set_level(AV_LOG_DEBUG); av_log_set_level(AV_LOG_DEBUG);
for(i=0; i<LEN; i++)
data[i]= ((i*i)>>3) + 123*i; for (i = 0; i < LEN; i++)
data[i] = ((i * i) >> 3) + 123 * i;
if (argc > 1 && !strcmp(argv[1], "-t")) { if (argc > 1 && !strcmp(argv[1], "-t")) {
for (i = 0; i < 1000; i++) { for (i = 0; i < 1000; i++) {
@ -76,6 +82,6 @@ int main(int argc, char **argv)
} }
av_log(NULL, AV_LOG_DEBUG, "%X (expected 50E6E508)\n", checksum); av_log(NULL, AV_LOG_DEBUG, "%X (expected 50E6E508)\n", checksum);
return checksum == 0x50e6e508? 0 : 1; return checksum == 0x50e6e508 ? 0 : 1;
} }
#endif #endif

Loading…
Cancel
Save