summaryrefslogtreecommitdiff
path: root/main/lzo/lzotest/wrap.h
diff options
context:
space:
mode:
Diffstat (limited to 'main/lzo/lzotest/wrap.h')
-rw-r--r--main/lzo/lzotest/wrap.h27
1 files changed, 8 insertions, 19 deletions
diff --git a/main/lzo/lzotest/wrap.h b/main/lzo/lzotest/wrap.h
index e85cd939..d2a9c13a 100644
--- a/main/lzo/lzotest/wrap.h
+++ b/main/lzo/lzotest/wrap.h
@@ -2,7 +2,7 @@
This file is part of the LZO real-time data compression library.
- Copyright (C) 1996-2014 Markus Franz Xaver Johannes Oberhumer
+ Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
All Rights Reserved.
The LZO library is free software; you can redistribute it and/or
@@ -211,9 +211,9 @@ memcpy_x_compress ( const lzo_bytep src, lzo_uint src_len,
lzo_bytep dst, lzo_uintp dst_len,
lzo_voidp wrkmem )
{
- lzo_memcpy(dst,src,src_len);
+ lzo_memcpy(dst, src, src_len);
*dst_len = src_len;
- if (wrkmem) wrkmem = 0; /* avoid warning */
+ LZO_UNUSED(wrkmem);
return 0;
}
@@ -223,10 +223,9 @@ memset_x_compress ( const lzo_bytep src, lzo_uint src_len,
lzo_bytep dst, lzo_uintp dst_len,
lzo_voidp wrkmem )
{
- lzo_memset(dst,0,src_len);
+ lzo_memset(dst, 0, src_len);
*dst_len = src_len;
- if (src) src = 0; /* avoid warning */
- if (wrkmem) wrkmem = 0; /* avoid warning */
+ LZO_UNUSED(src); LZO_UNUSED(wrkmem);
return 0;
}
@@ -240,8 +239,7 @@ adler32_x_compress ( const lzo_bytep src, lzo_uint src_len,
adler = lzo_adler32(0, NULL, 0);
adler = lzo_adler32(adler, dst, src_len);
*dst_len = src_len;
- if (src) src = 0; /* avoid warning */
- if (wrkmem) wrkmem = 0; /* avoid warning */
+ LZO_UNUSED(src); LZO_UNUSED(wrkmem);
return 0;
}
@@ -255,18 +253,9 @@ crc32_x_compress ( const lzo_bytep src, lzo_uint src_len,
crc = lzo_crc32(0, NULL, 0);
crc = lzo_crc32(crc, dst, src_len);
*dst_len = src_len;
- if (src) src = 0; /* avoid warning */
- if (wrkmem) wrkmem = 0; /* avoid warning */
+ LZO_UNUSED(src); LZO_UNUSED(wrkmem);
return 0;
}
-#if defined(__LZO_PROFESSIONAL__)
-# include "lzopro/t_wrap.ch"
-#endif
-
-
-/*
-vi:ts=4:et
-*/
-
+/* vim:set ts=4 sw=4 et: */