diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2011-03-18 10:11:29 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2011-03-18 10:11:29 +0000 |
commit | 6121dc77366dbc5b7fe28e6d405e498e79630c15 (patch) | |
tree | da2e2000ca12b6e2c1c739f123d867b0f182c841 /cpukit/zlib/adler32.c | |
parent | This commit was generated by cvs2svn to compensate for changes in r25189, (diff) | |
download | rtems-6121dc77366dbc5b7fe28e6d405e498e79630c15.tar.bz2 |
2010-03-22 Joel Sherrill <joel.sherrill@oarcorp.com>
* ChangeLog.zlib, FAQ, Makefile.am, README, adler32.c, compress.c,
crc32.c, deflate.c, deflate.h, infback.c, inffast.c, inflate.c,
inflate.h, inftrees.c, inftrees.h, trees.c, uncompr.c, zconf.h,
zlib.3, zlib.h, zutil.c, zutil.h: Update to zlib 1.2.4.
* gzclose.c, gzguts.h, gzlib.c, gzread.c, gzwrite.c, doc/algorithm.txt:
New files.
* algorithm.txt, gzio.c: Removed.
Diffstat (limited to 'cpukit/zlib/adler32.c')
-rw-r--r-- | cpukit/zlib/adler32.c | 50 |
1 files changed, 35 insertions, 15 deletions
diff --git a/cpukit/zlib/adler32.c b/cpukit/zlib/adler32.c index 74160ee2eb..65ad6a5adc 100644 --- a/cpukit/zlib/adler32.c +++ b/cpukit/zlib/adler32.c @@ -1,12 +1,15 @@ /* adler32.c -- compute the Adler-32 checksum of a data stream - * Copyright (C) 1995-2004 Mark Adler + * Copyright (C) 1995-2007 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ /* @(#) $Id$ */ -#define ZLIB_INTERNAL -#include "zlib.h" +#include "zutil.h" + +#define local static + +local uLong adler32_combine_(uLong adler1, uLong adler2, z_off64_t len2); #define BASE 65521UL /* largest prime smaller than 65536 */ #define NMAX 5552 @@ -54,10 +57,10 @@ #endif /* ========================================================================= */ -uLong ZEXPORT adler32( - uLong adler, - const Bytef *buf, - uInt len) +uLong ZEXPORT adler32(adler, buf, len) + uLong adler; + const Bytef *buf; + uInt len; { unsigned long sum2; unsigned n; @@ -125,10 +128,10 @@ uLong ZEXPORT adler32( } /* ========================================================================= */ -uLong ZEXPORT adler32_combine( - uLong adler1, - uLong adler2, - z_off_t len2) +local uLong adler32_combine_(adler1, adler2, len2) + uLong adler1; + uLong adler2; + z_off64_t len2; { unsigned long sum1; unsigned long sum2; @@ -141,9 +144,26 @@ uLong ZEXPORT adler32_combine( MOD(sum2); sum1 += (adler2 & 0xffff) + BASE - 1; sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem; - if (sum1 > BASE) sum1 -= BASE; - if (sum1 > BASE) sum1 -= BASE; - if (sum2 > (BASE << 1)) sum2 -= (BASE << 1); - if (sum2 > BASE) sum2 -= BASE; + if (sum1 >= BASE) sum1 -= BASE; + if (sum1 >= BASE) sum1 -= BASE; + if (sum2 >= (BASE << 1)) sum2 -= (BASE << 1); + if (sum2 >= BASE) sum2 -= BASE; return sum1 | (sum2 << 16); } + +/* ========================================================================= */ +uLong ZEXPORT adler32_combine(adler1, adler2, len2) + uLong adler1; + uLong adler2; + z_off_t len2; +{ + return adler32_combine_(adler1, adler2, len2); +} + +uLong ZEXPORT adler32_combine64(adler1, adler2, len2) + uLong adler1; + uLong adler2; + z_off64_t len2; +{ + return adler32_combine_(adler1, adler2, len2); +} |