diff options
| author | Kévin THIERRY <kevin.thierry@open.eurogiciel.org> | 2014-12-23 14:06:25 +0100 |
|---|---|---|
| committer | Kévin THIERRY <kevin.thierry@open.eurogiciel.org> | 2014-12-23 14:06:25 +0100 |
| commit | 79a9578a33ecd3093970bd18df677edc9214fafb (patch) | |
| tree | 8ae5c6780a1fcd2124e71f27ad9b4256acd24268 /lzotest/wrapmisc.h | |
| parent | 1bb1ce141783168d44a38cd1bb6b822eb13114fc (diff) | |
| download | lzo-79a9578a33ecd3093970bd18df677edc9214fafb.tar.gz lzo-79a9578a33ecd3093970bd18df677edc9214fafb.tar.bz2 lzo-79a9578a33ecd3093970bd18df677edc9214fafb.zip | |
Imported Upstream version 2.08upstream/2.08sandbox/kevinthierry/upstream
Diffstat (limited to 'lzotest/wrapmisc.h')
| -rw-r--r-- | lzotest/wrapmisc.h | 41 |
1 files changed, 13 insertions, 28 deletions
diff --git a/lzotest/wrapmisc.h b/lzotest/wrapmisc.h index 3fad078..8fb65b6 100644 --- a/lzotest/wrapmisc.h +++ b/lzotest/wrapmisc.h @@ -2,19 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2014 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or @@ -51,14 +39,14 @@ static int zlib_compress ( const m_bytep src, m_uint src_len, m_bytep dst, m_uintp dst_len, m_voidp wrkmem, - int method, int level ) + int method, int compression_level ) { int err; uLong destLen; assert(method == Z_DEFLATED); - destLen = *dst_len; - err = compress2(dst, &destLen, src, src_len, level); + destLen = (uLong) *dst_len; + err = compress2(dst, &destLen, src, (uLong) src_len, compression_level); *dst_len = destLen; LZO_UNUSED(method); LZO_UNUSED(wrkmem); @@ -74,8 +62,8 @@ zlib_decompress ( const m_bytep src, m_uint src_len, int err; uLong destLen; - destLen = *dst_len; - err = uncompress(dst, &destLen, src, src_len); + destLen = (uLong) *dst_len; + err = uncompress(dst, &destLen, src, (uLong) src_len); *dst_len = destLen; LZO_UNUSED(wrkmem); return err; @@ -153,15 +141,15 @@ static int bzip2_compress ( const m_bytep src, m_uint src_len, m_bytep dst, m_uintp dst_len, m_voidp wrkmem, - int level ) + int compression_level ) { int err; unsigned destLen; - union { const m_bytep csrc; char* src; } u; + union { const m_bytep csrc; char *src; } u; u.csrc = src; /* UNCONST */ destLen = *dst_len; - err = BZ2_bzBuffToBuffCompress((char*)dst, &destLen, u.src, src_len, level, 0, 0); + err = BZ2_bzBuffToBuffCompress((char*)dst, &destLen, u.src, src_len, compression_level, 0, 0); *dst_len = destLen; LZO_UNUSED(wrkmem); return err; @@ -175,7 +163,7 @@ bzip2_decompress ( const m_bytep src, m_uint src_len, { int err; unsigned destLen; - union { const m_bytep csrc; char* src; } u; + union { const m_bytep csrc; char *src; } u; u.csrc = src; /* UNCONST */ destLen = *dst_len; @@ -256,7 +244,7 @@ zlib_adler32_x_compress ( const m_bytep src, m_uint src_len, m_voidp wrkmem ) { uLong adler; - adler = adler32(1L, src, src_len); + adler = adler32(1L, src, (uInt) src_len); *dst_len = src_len; LZO_UNUSED(adler); LZO_UNUSED(dst); @@ -271,7 +259,7 @@ zlib_crc32_x_compress ( const m_bytep src, m_uint src_len, m_voidp wrkmem ) { uLong crc; - crc = crc32(0L, src, src_len); + crc = crc32(0L, src, (uInt) src_len); *dst_len = src_len; LZO_UNUSED(crc); LZO_UNUSED(dst); @@ -282,7 +270,4 @@ zlib_crc32_x_compress ( const m_bytep src, m_uint src_len, #endif /* ALG_ZLIB */ -/* -vi:ts=4:et -*/ - +/* vim:set ts=4 sw=4 et: */ |