diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2017-06-22 16:59:51 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2017-06-22 16:59:57 +0900 |
| commit | 57de6cacd32854c3b7942dde1803894341f78cee (patch) | |
| tree | ba55c881a740c59ea9443a139e4c4ae91e44e95d /src | |
| parent | 8ff61daa672f051d8ecb537edc94036b6cdaaf3f (diff) | |
| download | lzo-57de6cacd32854c3b7942dde1803894341f78cee.tar.gz lzo-57de6cacd32854c3b7942dde1803894341f78cee.tar.bz2 lzo-57de6cacd32854c3b7942dde1803894341f78cee.zip | |
Imported Upstream version 2.10upstream/2.10upstream
Change-Id: Ic72ac9c6134dff3a335d581378095e0011abcb08
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
Diffstat (limited to 'src')
109 files changed, 159 insertions, 165 deletions
diff --git a/src/compr1b.h b/src/compr1b.h index 8c23fe8..521c9f9 100644 --- a/src/compr1b.h +++ b/src/compr1b.h @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/compr1c.h b/src/compr1c.h index b5e8fb3..984ef7d 100644 --- a/src/compr1c.h +++ b/src/compr1c.h @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/config1.h b/src/config1.h index 99dd361..e67b600 100644 --- a/src/config1.h +++ b/src/config1.h @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/config1a.h b/src/config1a.h index c316447..c565235 100644 --- a/src/config1a.h +++ b/src/config1a.h @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/config1b.h b/src/config1b.h index 5b4e64a..ee50c1f 100644 --- a/src/config1b.h +++ b/src/config1b.h @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/config1c.h b/src/config1c.h index 7a888d9..988bc49 100644 --- a/src/config1c.h +++ b/src/config1c.h @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/config1f.h b/src/config1f.h index d6ca61d..1a0fa03 100644 --- a/src/config1f.h +++ b/src/config1f.h @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/config1x.h b/src/config1x.h index 72ced78..f3c93ef 100644 --- a/src/config1x.h +++ b/src/config1x.h @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/config1y.h b/src/config1y.h index 3386975..56fcfb0 100644 --- a/src/config1y.h +++ b/src/config1y.h @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/config1z.h b/src/config1z.h index e2f7a21..75ebb0a 100644 --- a/src/config1z.h +++ b/src/config1z.h @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/config2a.h b/src/config2a.h index 17c8281..4a4014b 100644 --- a/src/config2a.h +++ b/src/config2a.h @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or @@ -504,8 +504,8 @@ match: assert(end < in_end); } - while (ip < end && *m_pos == *ip) - m_pos++, ip++; + while (ip < end && *m_pos == *ip) + { m_pos++; ip++; } assert(ip <= in_end); /* 2b) code the long match */ diff --git a/src/lzo1_99.c b/src/lzo1_99.c index 506add2..8e1b37f 100644 --- a/src/lzo1_99.c +++ b/src/lzo1_99.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1_cm.ch b/src/lzo1_cm.ch index bfb1919..5f2ca08 100644 --- a/src/lzo1_cm.ch +++ b/src/lzo1_cm.ch @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1_d.ch b/src/lzo1_d.ch index 2e15a4a..bedc7ce 100644 --- a/src/lzo1_d.ch +++ b/src/lzo1_d.ch @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1a.c b/src/lzo1a.c index 1af4dba..6bffa30 100644 --- a/src/lzo1a.c +++ b/src/lzo1a.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or @@ -494,8 +494,8 @@ match: assert(end < in_end); } - while (ip < end && *m_pos == *ip) - m_pos++, ip++; + while (ip < end && *m_pos == *ip) + { m_pos++; ip++; } assert(ip <= in_end); /* 2a) compute match parameters */ diff --git a/src/lzo1a_99.c b/src/lzo1a_99.c index 75579d4..1628c92 100644 --- a/src/lzo1a_99.c +++ b/src/lzo1a_99.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1a_cm.ch b/src/lzo1a_cm.ch index 1b36e3c..01a957b 100644 --- a/src/lzo1a_cm.ch +++ b/src/lzo1a_cm.ch @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or @@ -153,8 +153,8 @@ assert(end < in_end); } - while (ip < end && *m_pos == *ip) - m_pos++, ip++; + while (ip < end && *m_pos == *ip) + { m_pos++; ip++; } assert(ip <= in_end); /* 2a) compute match parameters */ diff --git a/src/lzo1a_cr.ch b/src/lzo1a_cr.ch index eef584b..1071fa2 100644 --- a/src/lzo1a_cr.ch +++ b/src/lzo1a_cr.ch @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1a_de.h b/src/lzo1a_de.h index aaa0137..043c118 100644 --- a/src/lzo1a_de.h +++ b/src/lzo1a_de.h @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1b_1.c b/src/lzo1b_1.c index 101adba..5241125 100644 --- a/src/lzo1b_1.c +++ b/src/lzo1b_1.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1b_2.c b/src/lzo1b_2.c index 933bebb..764b0a5 100644 --- a/src/lzo1b_2.c +++ b/src/lzo1b_2.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1b_3.c b/src/lzo1b_3.c index 0d070ea..a2b9f2e 100644 --- a/src/lzo1b_3.c +++ b/src/lzo1b_3.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1b_4.c b/src/lzo1b_4.c index 17be356..722c82a 100644 --- a/src/lzo1b_4.c +++ b/src/lzo1b_4.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1b_5.c b/src/lzo1b_5.c index 920dbf1..b8bd8d5 100644 --- a/src/lzo1b_5.c +++ b/src/lzo1b_5.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1b_6.c b/src/lzo1b_6.c index 114aadd..0226fc8 100644 --- a/src/lzo1b_6.c +++ b/src/lzo1b_6.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1b_7.c b/src/lzo1b_7.c index 9f5e6d7..bfb8d72 100644 --- a/src/lzo1b_7.c +++ b/src/lzo1b_7.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1b_8.c b/src/lzo1b_8.c index 94d2042..d7736c3 100644 --- a/src/lzo1b_8.c +++ b/src/lzo1b_8.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1b_9.c b/src/lzo1b_9.c index 2d0532d..ebe70d5 100644 --- a/src/lzo1b_9.c +++ b/src/lzo1b_9.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1b_99.c b/src/lzo1b_99.c index 570f2b0..8a667cb 100644 --- a/src/lzo1b_99.c +++ b/src/lzo1b_99.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1b_9x.c b/src/lzo1b_9x.c index 285caad..c19b436 100644 --- a/src/lzo1b_9x.c +++ b/src/lzo1b_9x.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1b_c.ch b/src/lzo1b_c.ch index f13a812..cd14049 100644 --- a/src/lzo1b_c.ch +++ b/src/lzo1b_c.ch @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1b_cc.c b/src/lzo1b_cc.c index c3318ce..dfad7e2 100644 --- a/src/lzo1b_cc.c +++ b/src/lzo1b_cc.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1b_cc.h b/src/lzo1b_cc.h index 403025f..02a6d29 100644 --- a/src/lzo1b_cc.h +++ b/src/lzo1b_cc.h @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1b_cm.ch b/src/lzo1b_cm.ch index ccfa869..c38b138 100644 --- a/src/lzo1b_cm.ch +++ b/src/lzo1b_cm.ch @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or @@ -176,8 +176,8 @@ { const lzo_bytep end; end = in_end; - while (ip < end && *m_pos == *ip) - m_pos++, ip++; + while (ip < end && *m_pos == *ip) + { m_pos++; ip++; } assert(ip <= in_end); m_len = pd(ip, ii); } diff --git a/src/lzo1b_cr.ch b/src/lzo1b_cr.ch index 844ce94..bb3a9b9 100644 --- a/src/lzo1b_cr.ch +++ b/src/lzo1b_cr.ch @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1b_d.ch b/src/lzo1b_d.ch index 4fe164f..51e3684 100644 --- a/src/lzo1b_d.ch +++ b/src/lzo1b_d.ch @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1b_d1.c b/src/lzo1b_d1.c index 190eaa2..04c075a 100644 --- a/src/lzo1b_d1.c +++ b/src/lzo1b_d1.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1b_d2.c b/src/lzo1b_d2.c index 98a2704..a741c54 100644 --- a/src/lzo1b_d2.c +++ b/src/lzo1b_d2.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1b_de.h b/src/lzo1b_de.h index cf5abe9..50c337d 100644 --- a/src/lzo1b_de.h +++ b/src/lzo1b_de.h @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1b_r.ch b/src/lzo1b_r.ch index 827a67d..28fc137 100644 --- a/src/lzo1b_r.ch +++ b/src/lzo1b_r.ch @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1b_rr.c b/src/lzo1b_rr.c index c91bbec..b4f4f4f 100644 --- a/src/lzo1b_rr.c +++ b/src/lzo1b_rr.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1b_sm.ch b/src/lzo1b_sm.ch index 06a83e2..8e3f7c4 100644 --- a/src/lzo1b_sm.ch +++ b/src/lzo1b_sm.ch @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or @@ -129,8 +129,8 @@ { const lzo_bytep end; end = MATCH_IP_END; - while (ip < end && *m_pos == *ip) - m_pos++, ip++; + while (ip < end && *m_pos == *ip) + { m_pos++; ip++; } assert(ip <= in_end); x_len = pd(ip, ip_sav); } diff --git a/src/lzo1b_tm.ch b/src/lzo1b_tm.ch index a2da025..98ac2c8 100644 --- a/src/lzo1b_tm.ch +++ b/src/lzo1b_tm.ch @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1b_xx.c b/src/lzo1b_xx.c index 56f3006..ba7ab87 100644 --- a/src/lzo1b_xx.c +++ b/src/lzo1b_xx.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1c_1.c b/src/lzo1c_1.c index 28c3f0c..57d92c2 100644 --- a/src/lzo1c_1.c +++ b/src/lzo1c_1.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1c_2.c b/src/lzo1c_2.c index fa09d31..2e4a1c9 100644 --- a/src/lzo1c_2.c +++ b/src/lzo1c_2.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1c_3.c b/src/lzo1c_3.c index c8faa16..15710a7 100644 --- a/src/lzo1c_3.c +++ b/src/lzo1c_3.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1c_4.c b/src/lzo1c_4.c index ca772d9..3ba6bcf 100644 --- a/src/lzo1c_4.c +++ b/src/lzo1c_4.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1c_5.c b/src/lzo1c_5.c index 7e8c546..d43537c 100644 --- a/src/lzo1c_5.c +++ b/src/lzo1c_5.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1c_6.c b/src/lzo1c_6.c index 632b8c0..2afb6fd 100644 --- a/src/lzo1c_6.c +++ b/src/lzo1c_6.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1c_7.c b/src/lzo1c_7.c index ad8a6ab..d50c906 100644 --- a/src/lzo1c_7.c +++ b/src/lzo1c_7.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1c_8.c b/src/lzo1c_8.c index abb2b49..8ae847a 100644 --- a/src/lzo1c_8.c +++ b/src/lzo1c_8.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1c_9.c b/src/lzo1c_9.c index abbd0a1..ecc721c 100644 --- a/src/lzo1c_9.c +++ b/src/lzo1c_9.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1c_99.c b/src/lzo1c_99.c index c583e83..c81ecd1 100644 --- a/src/lzo1c_99.c +++ b/src/lzo1c_99.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1c_9x.c b/src/lzo1c_9x.c index cbc4e51..c4ea914 100644 --- a/src/lzo1c_9x.c +++ b/src/lzo1c_9x.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1c_cc.c b/src/lzo1c_cc.c index f704425..952df26 100644 --- a/src/lzo1c_cc.c +++ b/src/lzo1c_cc.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1c_cc.h b/src/lzo1c_cc.h index f8b7d83..86a5def 100644 --- a/src/lzo1c_cc.h +++ b/src/lzo1c_cc.h @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1c_d1.c b/src/lzo1c_d1.c index e3fec20..25283ac 100644 --- a/src/lzo1c_d1.c +++ b/src/lzo1c_d1.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1c_d2.c b/src/lzo1c_d2.c index fa83cdd..526d5e7 100644 --- a/src/lzo1c_d2.c +++ b/src/lzo1c_d2.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1c_rr.c b/src/lzo1c_rr.c index 7851fa4..5c7c987 100644 --- a/src/lzo1c_rr.c +++ b/src/lzo1c_rr.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1c_xx.c b/src/lzo1c_xx.c index 8b46509..fb8d304 100644 --- a/src/lzo1c_xx.c +++ b/src/lzo1c_xx.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1f_1.c b/src/lzo1f_1.c index 44a138c..c201383 100644 --- a/src/lzo1f_1.c +++ b/src/lzo1f_1.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or @@ -200,7 +200,7 @@ match: const lzo_bytep end; end = in_end; while (ip < end && *m_pos == *ip) - m_pos++, ip++; + { m_pos++; ip++; } m_len = pd(ip, ii); } assert(m_len >= 3); diff --git a/src/lzo1f_9x.c b/src/lzo1f_9x.c index 353aca0..927cdd5 100644 --- a/src/lzo1f_9x.c +++ b/src/lzo1f_9x.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1f_d.ch b/src/lzo1f_d.ch index c5093c1..e86027b 100644 --- a/src/lzo1f_d.ch +++ b/src/lzo1f_d.ch @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1f_d1.c b/src/lzo1f_d1.c index 278fb68..b6931a0 100644 --- a/src/lzo1f_d1.c +++ b/src/lzo1f_d1.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1f_d2.c b/src/lzo1f_d2.c index f98f855..160d2ce 100644 --- a/src/lzo1f_d2.c +++ b/src/lzo1f_d2.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1x_1.c b/src/lzo1x_1.c index 2c6cb46..a659393 100644 --- a/src/lzo1x_1.c +++ b/src/lzo1x_1.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1x_1k.c b/src/lzo1x_1k.c index 74291c0..4ae6eda 100644 --- a/src/lzo1x_1k.c +++ b/src/lzo1x_1k.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1x_1l.c b/src/lzo1x_1l.c index 6fa81fd..90b42e1 100644 --- a/src/lzo1x_1l.c +++ b/src/lzo1x_1l.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1x_1o.c b/src/lzo1x_1o.c index 8fd8584..b935fc7 100644 --- a/src/lzo1x_1o.c +++ b/src/lzo1x_1o.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1x_9x.c b/src/lzo1x_9x.c index 4432e48..6337f14 100644 --- a/src/lzo1x_9x.c +++ b/src/lzo1x_9x.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1x_c.ch b/src/lzo1x_c.ch index 562e0b1..be19b2b 100644 --- a/src/lzo1x_c.ch +++ b/src/lzo1x_c.ch @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1x_d.ch b/src/lzo1x_d.ch index 5107f5f..b6c6d99 100644 --- a/src/lzo1x_d.ch +++ b/src/lzo1x_d.ch @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1x_d1.c b/src/lzo1x_d1.c index b31f6de..68faf48 100644 --- a/src/lzo1x_d1.c +++ b/src/lzo1x_d1.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1x_d2.c b/src/lzo1x_d2.c index abe9463..8b7c316 100644 --- a/src/lzo1x_d2.c +++ b/src/lzo1x_d2.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1x_d3.c b/src/lzo1x_d3.c index 8bde36f..b3d430f 100644 --- a/src/lzo1x_d3.c +++ b/src/lzo1x_d3.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1x_o.c b/src/lzo1x_o.c index be596a7..9fdf306 100644 --- a/src/lzo1x_o.c +++ b/src/lzo1x_o.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1x_oo.ch b/src/lzo1x_oo.ch index 82871bb..bb16fd4 100644 --- a/src/lzo1x_oo.ch +++ b/src/lzo1x_oo.ch @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or @@ -118,7 +118,7 @@ DO_OPTIMIZE ( lzo_bytep in , lzo_uint in_len, { t = 15; while (*ip == 0) - t += 255, ip++; + { t += 255; ip++; } t += *ip++; } lit = t + 3; @@ -240,7 +240,7 @@ match: { t = 31; while (*ip == 0) - t += 255, ip++; + { t += 255; ip++; } t += *ip++; } m_pos = op - 1; @@ -256,7 +256,7 @@ match: { t = 7; while (*ip == 0) - t += 255, ip++; + { t += 255; ip++; } t += *ip++; } m_pos -= *ip++ >> 2; diff --git a/src/lzo1y_1.c b/src/lzo1y_1.c index 5e1186b..30e9ffc 100644 --- a/src/lzo1y_1.c +++ b/src/lzo1y_1.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1y_9x.c b/src/lzo1y_9x.c index d905a17..983a880 100644 --- a/src/lzo1y_9x.c +++ b/src/lzo1y_9x.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1y_d1.c b/src/lzo1y_d1.c index 78e372c..cbfa23c 100644 --- a/src/lzo1y_d1.c +++ b/src/lzo1y_d1.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1y_d2.c b/src/lzo1y_d2.c index 2f14724..76fec55 100644 --- a/src/lzo1y_d2.c +++ b/src/lzo1y_d2.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1y_d3.c b/src/lzo1y_d3.c index 9c61750..08324d6 100644 --- a/src/lzo1y_d3.c +++ b/src/lzo1y_d3.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1y_o.c b/src/lzo1y_o.c index f6d2c0a..1e32b75 100644 --- a/src/lzo1y_o.c +++ b/src/lzo1y_o.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1z_9x.c b/src/lzo1z_9x.c index 8914daf..082baa4 100644 --- a/src/lzo1z_9x.c +++ b/src/lzo1z_9x.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1z_d1.c b/src/lzo1z_d1.c index 53d4dbc..3b7b996 100644 --- a/src/lzo1z_d1.c +++ b/src/lzo1z_d1.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1z_d2.c b/src/lzo1z_d2.c index bb21364..6515af4 100644 --- a/src/lzo1z_d2.c +++ b/src/lzo1z_d2.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo1z_d3.c b/src/lzo1z_d3.c index 784bb7f..d7eae4c 100644 --- a/src/lzo1z_d3.c +++ b/src/lzo1z_d3.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo2a_9x.c b/src/lzo2a_9x.c index 0e14916..cc1401c 100644 --- a/src/lzo2a_9x.c +++ b/src/lzo2a_9x.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo2a_d.ch b/src/lzo2a_d.ch index dcd2b54..cbbb79e 100644 --- a/src/lzo2a_d.ch +++ b/src/lzo2a_d.ch @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo2a_d1.c b/src/lzo2a_d1.c index 5694738..20a167c 100644 --- a/src/lzo2a_d1.c +++ b/src/lzo2a_d1.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo2a_d2.c b/src/lzo2a_d2.c index 5bf1a21..0d7ce52 100644 --- a/src/lzo2a_d2.c +++ b/src/lzo2a_d2.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo_conf.h b/src/lzo_conf.h index 0690181..aa9a2b6 100644 --- a/src/lzo_conf.h +++ b/src/lzo_conf.h @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or @@ -65,7 +65,7 @@ #endif #endif /* !defined(__LZO_IN_MINILZO) */ -#if !defined(__LZOCONF_H_INCLUDED) || (LZO_VERSION+0 != 0x2090) +#if !defined(__LZOCONF_H_INCLUDED) || (LZO_VERSION+0 != 0x20a0) # error "version mismatch" #endif diff --git a/src/lzo_crc.c b/src/lzo_crc.c index b35ec23..56235e2 100644 --- a/src/lzo_crc.c +++ b/src/lzo_crc.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or @@ -31,7 +31,7 @@ /*********************************************************************** // crc32 checksum -// adapted from free code by Mark Adler <madler@alumni.caltech.edu> +// adapted from free code by Mark Adler <madler at alumni.caltech.edu> // see http://www.zlib.org/ ************************************************************************/ diff --git a/src/lzo_dict.h b/src/lzo_dict.h index 68ec43f..e48addb 100644 --- a/src/lzo_dict.h +++ b/src/lzo_dict.h @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo_dll.ch b/src/lzo_dll.ch index 6fda0bc..d66839e 100644 --- a/src/lzo_dll.ch +++ b/src/lzo_dll.ch @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo_func.h b/src/lzo_func.h index 3c204da..f3ac8e3 100644 --- a/src/lzo_func.h +++ b/src/lzo_func.h @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo_init.c b/src/lzo_init.c index 142e95c..31fdabe 100644 --- a/src/lzo_init.c +++ b/src/lzo_init.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo_mchw.ch b/src/lzo_mchw.ch index bcfec46..94bedc3 100644 --- a/src/lzo_mchw.ch +++ b/src/lzo_mchw.ch @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo_ptr.c b/src/lzo_ptr.c index 38359ff..d2def7f 100644 --- a/src/lzo_ptr.c +++ b/src/lzo_ptr.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo_ptr.h b/src/lzo_ptr.h index 736c7c5..8d7ee44 100644 --- a/src/lzo_ptr.h +++ b/src/lzo_ptr.h @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo_str.c b/src/lzo_str.c index 3364e8a..beac725 100644 --- a/src/lzo_str.c +++ b/src/lzo_str.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/lzo_supp.h b/src/lzo_supp.h index 87307f9..a2c9021 100644 --- a/src/lzo_supp.h +++ b/src/lzo_supp.h @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or @@ -71,12 +71,12 @@ #if (LZO_OS_POSIX) # if (LZO_OS_POSIX_AIX) # define HAVE_SYS_RESOURCE_H 1 -# elif (LZO_OS_POSIX_FREEBSD || LZO_OS_POSIX_MACOSX || LZO_OS_POSIX_NETBSD || LZO_OS_POSIX_OPENBSD) +# elif (LZO_OS_POSIX_DARWIN || LZO_OS_POSIX_FREEBSD || LZO_OS_POSIX_NETBSD || LZO_OS_POSIX_OPENBSD) # define HAVE_STRINGS_H 1 # undef HAVE_MALLOC_H # elif (LZO_OS_POSIX_HPUX || LZO_OS_POSIX_INTERIX) # define HAVE_ALLOCA_H 1 -# elif (LZO_OS_POSIX_MACOSX && LZO_LIBC_MSL) +# elif (LZO_OS_POSIX_DARWIN && LZO_LIBC_MSL) # undef HAVE_SYS_TIME_H # undef HAVE_SYS_TYPES_H # elif (LZO_OS_POSIX_SOLARIS || LZO_OS_POSIX_SUNOS) @@ -154,7 +154,7 @@ # undef HAVE_UTIME_H # undef HAVE_SYS_TIME_H # define HAVE_SYS_UTIME_H 1 -#elif (LZO_CC_GHS || LZO_CC_INTELC || LZO_CC_MSC) +#elif (LZO_CC_CLANG_C2 || LZO_CC_CLANG_MSC || LZO_CC_GHS || LZO_CC_INTELC_MSC || LZO_CC_MSC) # undef HAVE_DIRENT_H # undef HAVE_UNISTD_H # undef HAVE_UTIME_H @@ -352,7 +352,7 @@ #if (LZO_OS_POSIX) # if (LZO_OS_POSIX_AIX) # define HAVE_GETRUSAGE 1 -# elif (LZO_OS_POSIX_MACOSX && LZO_LIBC_MSL) +# elif (LZO_OS_POSIX_DARWIN && LZO_LIBC_MSL) # undef HAVE_CHOWN # undef HAVE_LSTAT # elif (LZO_OS_POSIX_UNICOS) @@ -448,7 +448,7 @@ #elif (LZO_CC_IBMC) # undef HAVE_SNPRINTF # undef HAVE_VSNPRINTF -#elif (LZO_CC_INTELC) +#elif (LZO_CC_CLANG_MSC || LZO_CC_INTELC_MSC) # ifndef snprintf # define snprintf _snprintf # endif @@ -457,7 +457,7 @@ # endif #elif (LZO_CC_LCCWIN32) # define utime _utime -#elif (LZO_CC_MSC) +#elif (LZO_CC_CLANG_C2 || LZO_CC_MSC) # if (_MSC_VER < 600) # undef HAVE_STRFTIME # endif @@ -471,7 +471,7 @@ # ifndef vsnprintf # define vsnprintf _vsnprintf # endif -# else +# elif (_MSC_VER < 1900) # ifndef snprintf # define snprintf _snprintf # endif @@ -656,8 +656,6 @@ extern "C" { #endif #if (LZO_BROKEN_CDECL_ALT_SYNTAX) typedef void __lzo_cdecl_sighandler (*lzo_sighandler_t)(lzo_signo_t); -#elif defined(RETSIGTYPE) -typedef RETSIGTYPE (__lzo_cdecl_sighandler *lzo_sighandler_t)(lzo_signo_t); #else typedef void (__lzo_cdecl_sighandler *lzo_sighandler_t)(lzo_signo_t); #endif @@ -812,7 +810,7 @@ typedef unsigned short wchar_t; #if (HAVE_SIGNAL_H) # include <signal.h> #endif -#if (TIME_WITH_SYS_TIME) +#if (HAVE_SYS_TIME_H && HAVE_TIME_H) # include <sys/time.h> # include <time.h> #elif (HAVE_TIME_H) @@ -1513,18 +1511,17 @@ LZOLIB_EXTERN(int, lzo_spawnve) (int mode, const char* fn, const char* const * a # endif #endif LZOCHK_ASSERT(1 == 1) - LZOCHK_ASSERT(__LZO_MASK_GEN(1u,1) == 1) - LZOCHK_ASSERT(__LZO_MASK_GEN(1u,2) == 3) - LZOCHK_ASSERT(__LZO_MASK_GEN(1u,3) == 7) - LZOCHK_ASSERT(__LZO_MASK_GEN(1u,8) == 255) + LZOCHK_ASSERT(__LZO_MASK_GEN(1u,1) == 1u) + LZOCHK_ASSERT(__LZO_MASK_GEN(1u,2) == 3u) + LZOCHK_ASSERT(__LZO_MASK_GEN(1u,3) == 7u) + LZOCHK_ASSERT(__LZO_MASK_GEN(1u,8) == 255u) #if (LZO_SIZEOF_INT >= 2) LZOCHK_ASSERT(__LZO_MASK_GEN(1,15) == 32767) LZOCHK_ASSERT(__LZO_MASK_GEN(1u,16) == 0xffffU) LZOCHK_ASSERT(__LZO_MASK_GEN(0u,16) == 0u) -#else +#endif LZOCHK_ASSERT(__LZO_MASK_GEN(1ul,16) == 0xffffUL) LZOCHK_ASSERT(__LZO_MASK_GEN(0ul,16) == 0ul) -#endif #if (LZO_SIZEOF_INT >= 4) LZOCHK_ASSERT(__LZO_MASK_GEN(1,31) == 2147483647) LZOCHK_ASSERT(__LZO_MASK_GEN(1u,32) == 0xffffffffU) @@ -1922,6 +1919,14 @@ LZOLIB_EXTERN(int, lzo_spawnve) (int mode, const char* fn, const char* const * a LZOCHK_ASSERT(sizeof(size_t) == sizeof(void*)) LZOCHK_ASSERT(sizeof(lzo_intptr_t) == sizeof(void *)) #endif +#if (LZO_ABI_IP32W64) + LZOCHK_ASSERT(sizeof(int) == 4) + LZOCHK_ASSERT(sizeof(void*) == 4) + LZOCHK_ASSERT(sizeof(ptrdiff_t) == sizeof(void*)) + LZOCHK_ASSERT(sizeof(size_t) == sizeof(void*)) + LZOCHK_ASSERT(sizeof(lzo_intptr_t) == sizeof(void *)) + LZOCHK_ASSERT(LZO_WORDSIZE == 8) +#endif #if (LZO_ARCH_I086) LZOCHK_ASSERT(sizeof(size_t) == 2) LZOCHK_ASSERT(sizeof(lzo_intptr_t) == sizeof(void *)) @@ -2537,7 +2542,7 @@ LZOLIB_PUBLIC(int, lzo_getopt) (lzo_getopt_p g, if (!s || s[1] != ':') { if (!a[0]) - ++g->optind, g->shortpos = 0; + { ++g->optind; g->shortpos = 0; } if (!s) { g->optopt = c; @@ -2546,7 +2551,7 @@ LZOLIB_PUBLIC(int, lzo_getopt) (lzo_getopt_p g, } else { - ++g->optind, g->shortpos = 0; + ++g->optind; g->shortpos = 0; if (a[0]) g->optarg = a; else if (s[2] != ':') @@ -2656,7 +2661,7 @@ LZOLIB_PUBLIC(lzo_hvoid_p, lzo_halloc) (lzo_hsize_t size) p = lmalloc(size); #else if (size < LZO_STATIC_CAST(size_t, -1)) - p = malloc((size_t) size); + p = malloc(LZO_STATIC_CAST(size_t, size)); #endif } #endif @@ -2866,25 +2871,25 @@ LZOLIB_PUBLIC(long, lzo_safe_hwrite) (int fd, const lzo_hvoid_p buf, long size) #if !defined(LZOLIB_PUBLIC) # define LZOLIB_PUBLIC(r,f) r __LZOLIB_FUNCNAME(f) #endif -#if 1 && (LZO_OS_POSIX_LINUX && LZO_ARCH_AMD64 && LZO_ASM_SYNTAX_GNUC) +#if 1 && (LZO_OS_POSIX_LINUX && LZO_ARCH_AMD64 && LZO_ASM_SYNTAX_GNUC && !LZO_CFG_NO_SYSCALL) #ifndef lzo_pclock_syscall_clock_gettime #define lzo_pclock_syscall_clock_gettime lzo_pclock_syscall_clock_gettime #endif __lzo_static_noinline long lzo_pclock_syscall_clock_gettime(long clockid, struct timespec *ts) { unsigned long r = 228; - __asm__ __volatile__("syscall\n" : "=a" (r) : "0" (r), "D" (clockid), "S" (ts) __LZO_ASM_CLOBBER_LIST_CC_MEMORY); + __asm__ __volatile__("syscall\n" : "=a" (r), "=m" (*ts) : "0" (r), "D" (clockid), "S" (ts) __LZO_ASM_CLOBBER_LIST_CC); return LZO_ICAST(long, r); } #endif -#if 1 && (LZO_OS_POSIX_LINUX && LZO_ARCH_I386 && LZO_ASM_SYNTAX_GNUC) && defined(lzo_int64l_t) +#if 1 && (LZO_OS_POSIX_LINUX && LZO_ARCH_I386 && LZO_ASM_SYNTAX_GNUC && !LZO_CFG_NO_SYSCALL) && defined(lzo_int64l_t) #ifndef lzo_pclock_syscall_clock_gettime #define lzo_pclock_syscall_clock_gettime lzo_pclock_syscall_clock_gettime #endif __lzo_static_noinline long lzo_pclock_syscall_clock_gettime(long clockid, struct timespec *ts) { unsigned long r = 265; - __asm__ __volatile__("pushl %%ebx\n pushl %%edx\n popl %%ebx\n int $0x80\n popl %%ebx\n" : "=a" (r) : "0" (r), "d" (clockid), "c" (ts) __LZO_ASM_CLOBBER_LIST_CC_MEMORY); + __asm__ __volatile__("pushl %%ebx\n pushl %%edx\n popl %%ebx\n int $0x80\n popl %%ebx\n": "=a" (r), "=m" (*ts) : "0" (r), "d" (clockid), "c" (ts) __LZO_ASM_CLOBBER_LIST_CC); return LZO_ICAST(long, r); } #endif @@ -3283,14 +3288,6 @@ LZOLIB_PUBLIC(int, lzo_pclock_flush_cpu_cache) (lzo_pclock_handle_p h, unsigned LZO_UNUSED(h); LZO_UNUSED(flags); return -1; } -#if defined(__LZOLIB_PCLOCK_NEED_WARN_POP) -# if (LZO_CC_MSC && (_MSC_VER >= 1200)) -# pragma warning(pop) -# else -# error "__LZOLIB_PCLOCK_NEED_WARN_POP" -# endif -# undef __LZOLIB_PCLOCK_NEED_WARN_POP -#endif #endif #if defined(LZO_WANT_ACCLIB_MISC) # undef LZO_WANT_ACCLIB_MISC @@ -3510,11 +3507,6 @@ LZOLIB_PUBLIC(lzo_uint32e_t, lzo_muldiv32u) (lzo_uint32e_t a, lzo_uint32e_t b, l return r; } #endif -#if 0 -LZOLIB_PUBLIC_NOINLINE(int, lzo_syscall_clock_gettime) (int c) -{ -} -#endif #if (LZO_OS_WIN16) LZO_EXTERN_C void __far __pascal DebugBreak(void); #endif @@ -3642,7 +3634,8 @@ LZO_EXTERN_C int __lzo_cdecl _setargv(void) { return __setargv(); } #endif #endif #if (LZO_OS_WIN32 || LZO_OS_WIN64) -#if (LZO_CC_INTELC || LZO_CC_MSC) +#if (LZO_CC_MSC && (_MSC_VER >= 1900)) +#elif (LZO_CC_INTELC || LZO_CC_MSC) LZO_EXTERN_C int __lzo_cdecl __setargv(void); LZO_EXTERN_C int __lzo_cdecl _setargv(void); LZO_EXTERN_C int __lzo_cdecl _setargv(void) { return __setargv(); } diff --git a/src/lzo_swd.ch b/src/lzo_swd.ch index 4a73a6b..20bc461 100644 --- a/src/lzo_swd.ch +++ b/src/lzo_swd.ch @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or @@ -514,12 +514,13 @@ void swd_search(lzo_swd_p s, lzo_uint node, lzo_uint cnt) const lzo_bytep b = s_b(s); const lzo_bytep bp = s_b(s) + s->bp; const lzo_bytep bx = s_b(s) + s->bp + s->look; + swd_uintp succ3 = s_succ3(s); unsigned char scan_end1; assert(s->m_len > 0); scan_end1 = bp[m_len - 1]; - for ( ; cnt-- > 0; node = s_succ3(s)[node]) + for ( ; cnt-- > 0; node = succ3[node]) { p1 = bp; p2 = b + node; diff --git a/src/lzo_util.c b/src/lzo_util.c index 2f8059f..f1d72e3 100644 --- a/src/lzo_util.c +++ b/src/lzo_util.c @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or @@ -44,7 +44,7 @@ static const char lzo_copyright_[] = #else "\r\n\n" "LZO data compression library.\n" - "$Copyright: LZO Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer\n" + "$Copyright: LZO Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer\n" "<markus@oberhumer.com>\n" "http://www.oberhumer.com $\n\n" "$Id: LZO version: v" LZO_VERSION_STRING ", " LZO_VERSION_DATE " $\n" @@ -93,7 +93,7 @@ _lzo_version_date(void) /*********************************************************************** // adler32 checksum -// adapted from free code by Mark Adler <madler@alumni.caltech.edu> +// adapted from free code by Mark Adler <madler at alumni.caltech.edu> // see http://www.zlib.org/ ************************************************************************/ diff --git a/src/stats1a.h b/src/stats1a.h index 8edfd90..c72d2c1 100644 --- a/src/stats1a.h +++ b/src/stats1a.h @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/stats1b.h b/src/stats1b.h index 20274cd..52011b9 100644 --- a/src/stats1b.h +++ b/src/stats1b.h @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or diff --git a/src/stats1c.h b/src/stats1c.h index 8804c2c..0bbd841 100644 --- a/src/stats1c.h +++ b/src/stats1c.h @@ -2,7 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or |