diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2011-07-07 02:57:26 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2011-07-07 02:57:26 +0000 |
| commit | ee5cd0903a80ae6b6ca2b3cfd67063fe2f873d12 (patch) | |
| tree | ae3eb9a4e68e144c6682c4b51d3cee5c585d4a6c /sys/lib/libz/adler32.c | |
| parent | ab8a8b247d0d9b96e461ed86b97cace56d02726f (diff) | |
Replace the cruddy old sys/net/zlib.[ch]. We now use the sys/lib/libz
code. Missing chunks of the API are imported from the libc version,
with a few #ifdef's to port it into the kernel environment.
The bootblocks already used the newer code, and should encounter no
surprises since there are so few changes to the existing files. In
the kernel, ipcomp and kernel ppp are changed to the new API.
ipcomp has been tested.
ok tedu the brave
Diffstat (limited to 'sys/lib/libz/adler32.c')
| -rw-r--r-- | sys/lib/libz/adler32.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/lib/libz/adler32.c b/sys/lib/libz/adler32.c index 73e134a0407..6afbdc620a4 100644 --- a/sys/lib/libz/adler32.c +++ b/sys/lib/libz/adler32.c @@ -1,4 +1,4 @@ -/* $OpenBSD: adler32.c,v 1.9 2006/07/20 11:14:10 mickey Exp $ */ +/* $OpenBSD: adler32.c,v 1.10 2011/07/07 02:57:24 deraadt Exp $ */ /* adler32.c -- compute the Adler-32 checksum of a data stream * Copyright (C) 1995-2004 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h @@ -123,7 +123,6 @@ uLong ZEXPORT adler32(adler, buf, len) return adler | (sum2 << 16); } -#ifdef ADLER32_COMBINE /* ========================================================================= */ uLong ZEXPORT adler32_combine(adler1, adler2, len2) uLong adler1; @@ -147,4 +146,3 @@ uLong ZEXPORT adler32_combine(adler1, adler2, len2) if (sum2 > BASE) sum2 -= BASE; return sum1 | (sum2 << 16); } -#endif /* ADLER32_COMBINE */ |