diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2018-06-12 17:34:54 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2018-06-12 17:35:01 +0900 |
| commit | 46a0aa70a35939815807200bf1fa20c40eb70a8f (patch) | |
| tree | fb9e6c918b2d0ab3935e96ec36bc4cc6f578cac5 /src | |
| parent | a97fbf725aa75db53756b59df6888e59b47c931d (diff) | |
| parent | cf55f4b64fc18401baba427c6d5ea4cb7b1ed094 (diff) | |
| download | lzo-tizen_5.5_mobile_hotfix.tar.gz lzo-tizen_5.5_mobile_hotfix.tar.bz2 lzo-tizen_5.5_mobile_hotfix.zip | |
Merge branch 'tizen_base' into tizentizen_9.0_m2_releasetizen_8.0_m2_releasetizen_7.0_m2_releasetizen_6.5.m2_releasetizen_6.0.m2_releasetizen_5.5.m2_releasesubmit/tizen_6.5/20211028.163501submit/tizen_6.0_hotfix/20201103.115103submit/tizen_6.0_hotfix/20201102.192903submit/tizen_6.0/20201029.205503submit/tizen_5.5_wearable_hotfix/20201026.184307submit/tizen_5.5_mobile_hotfix/20201026.185107submit/tizen_5.5/20191031.000007submit/tizen_5.0/20181101.000007submit/tizen/20180615.072409submit/tizen/20180612.085133submit/tizen/20180612.084651accepted/tizen/unified/20180618.151445accepted/tizen/9.0/unified/20241030.232558accepted/tizen/8.0/unified/20231005.095211accepted/tizen/7.0/unified/hotfix/20221116.111123accepted/tizen/7.0/unified/20221110.060805accepted/tizen/6.5/unified/20211029.014748accepted/tizen/6.0/unified/hotfix/20201102.231413accepted/tizen/6.0/unified/20201030.112922accepted/tizen/5.5/unified/wearable/hotfix/20201027.101023accepted/tizen/5.5/unified/mobile/hotfix/20201027.074655accepted/tizen/5.5/unified/20191031.012511accepted/tizen/5.0/unified/20181102.031024tizen_9.0tizen_7.0_hotfixtizen_7.0tizen_6.5tizen_6.0_hotfixtizen_6.0tizen_5.5_wearable_hotfixtizen_5.5_tvtizen_5.5_mobile_hotfixtizen_5.5tizen_5.0accepted/tizen_unifiedaccepted/tizen_9.0_unifiedaccepted/tizen_8.0_unifiedaccepted/tizen_7.0_unified_hotfixaccepted/tizen_7.0_unifiedaccepted/tizen_6.5_unifiedaccepted/tizen_6.0_unified_hotfixaccepted/tizen_6.0_unifiedaccepted/tizen_5.5_unified_wearable_hotfixaccepted/tizen_5.5_unified_mobile_hotfixaccepted/tizen_5.5_unifiedaccepted/tizen_5.0_unified
Change-Id: I005b25a1dcc898cbdf59ac1559529584eed017af
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
Diffstat (limited to 'src')
109 files changed, 471 insertions, 494 deletions
diff --git a/src/compr1b.h b/src/compr1b.h index 32b2266..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-2014 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 @@ -64,6 +64,5 @@ LZO_COMPRESS ( const lzo_bytep in, lzo_uint in_len, return _lzo1b_do_compress(in,in_len,out,out_len,wrkmem,do_compress); } -/* -vi:ts=4:et -*/ + +/* vim:set ts=4 sw=4 et: */ diff --git a/src/compr1c.h b/src/compr1c.h index 566ba44..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-2014 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 @@ -64,6 +64,5 @@ LZO_COMPRESS ( const lzo_bytep in, lzo_uint in_len, return _lzo1c_do_compress(in,in_len,out,out_len,wrkmem,do_compress); } -/* -vi:ts=4:et -*/ + +/* vim:set ts=4 sw=4 et: */ diff --git a/src/config1.h b/src/config1.h index 592f473..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-2014 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 @@ -35,7 +35,7 @@ #define __LZO_CONFIG1_H 1 #include "lzo_conf.h" -#include "lzo/lzo1.h" +#include <lzo/lzo1.h> #define LZO_NO_R1 1 #include "config1a.h" @@ -43,7 +43,4 @@ #endif /* already included */ -/* -vi:ts=4:et -*/ - +/* vim:set ts=4 sw=4 et: */ diff --git a/src/config1a.h b/src/config1a.h index 3f0aa48..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-2014 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 @@ -36,7 +36,7 @@ #define __LZO_CONFIG1A_H 1 #include "lzo_conf.h" -#include "lzo/lzo1a.h" +#include <lzo/lzo1a.h> #undef LZO_COLLECT_STATS /* no support for stats here */ @@ -178,7 +178,5 @@ #endif /* already included */ -/* -vi:ts=4:et -*/ +/* vim:set ts=4 sw=4 et: */ diff --git a/src/config1b.h b/src/config1b.h index 26f47cb..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-2014 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 @@ -36,7 +36,7 @@ #define __LZO_CONFIG1B_H 1 #include "lzo_conf.h" -#include "lzo/lzo1b.h" +#include <lzo/lzo1b.h> /*********************************************************************** @@ -122,7 +122,5 @@ #endif /* already included */ -/* -vi:ts=4:et -*/ +/* vim:set ts=4 sw=4 et: */ diff --git a/src/config1c.h b/src/config1c.h index a465eaf..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-2014 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 @@ -36,7 +36,7 @@ #define __LZO_CONFIG1C_H 1 #include "lzo_conf.h" -#include "lzo/lzo1c.h" +#include <lzo/lzo1c.h> /*********************************************************************** @@ -127,7 +127,5 @@ #endif /* already included */ -/* -vi:ts=4:et -*/ +/* vim:set ts=4 sw=4 et: */ diff --git a/src/config1f.h b/src/config1f.h index 5e2a8e9..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-2014 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 @@ -36,7 +36,7 @@ #define __LZO_CONFIG1F_H 1 #include "lzo_conf.h" -#include "lzo/lzo1f.h" +#include <lzo/lzo1f.h> /*********************************************************************** @@ -79,7 +79,5 @@ #endif /* already included */ -/* -vi:ts=4:et -*/ +/* vim:set ts=4 sw=4 et: */ diff --git a/src/config1x.h b/src/config1x.h index cbbc167..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-2014 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 @@ -41,7 +41,7 @@ #include "lzo_conf.h" #if !defined(__LZO_IN_MINILZO) -#include "lzo/lzo1x.h" +#include <lzo/lzo1x.h> #endif @@ -102,7 +102,5 @@ #endif /* already included */ -/* -vi:ts=4:et -*/ +/* vim:set ts=4 sw=4 et: */ diff --git a/src/config1y.h b/src/config1y.h index a36dac1..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-2014 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 @@ -40,7 +40,7 @@ #endif #include "lzo_conf.h" -#include "lzo/lzo1y.h" +#include <lzo/lzo1y.h> #define M2_MAX_LEN 14 #define M2_MAX_OFFSET 0x0400 @@ -48,7 +48,5 @@ #endif /* already included */ -/* -vi:ts=4:et -*/ +/* vim:set ts=4 sw=4 et: */ diff --git a/src/config1z.h b/src/config1z.h index fcbc838..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-2014 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 @@ -40,14 +40,12 @@ #endif #include "lzo_conf.h" -#include "lzo/lzo1z.h" +#include <lzo/lzo1z.h> #define M2_MAX_OFFSET 0x0700 #include "config1x.h" #endif /* already included */ -/* -vi:ts=4:et -*/ +/* vim:set ts=4 sw=4 et: */ diff --git a/src/config2a.h b/src/config2a.h index 16b74b0..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-2014 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 @@ -36,7 +36,7 @@ #define __LZO_CONFIG2A_H 1 #include "lzo_conf.h" -#include "lzo/lzo2a.h" +#include <lzo/lzo2a.h> /*********************************************************************** @@ -137,7 +137,5 @@ #endif /* already included */ -/* -vi:ts=4:et -*/ +/* vim:set ts=4 sw=4 et: */ @@ -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-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or @@ -27,7 +27,7 @@ #include "lzo_conf.h" -#include "lzo/lzo1.h" +#include <lzo/lzo1.h> /*********************************************************************** @@ -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 */ @@ -618,6 +618,4 @@ lzo1_compress ( const lzo_bytep in , lzo_uint in_len, } -/* -vi:ts=4:et -*/ +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1_99.c b/src/lzo1_99.c index a0ebf36..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-2014 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 @@ -113,6 +113,4 @@ LZO_COMPRESS ( const lzo_bytep in, lzo_uint in_len, } -/* -vi:ts=4:et -*/ +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1_cm.ch b/src/lzo1_cm.ch index 9e6ee32..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-2014 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 @@ -35,6 +35,4 @@ #include "lzo1a_cm.ch" -/* -vi:ts=4:et -*/ +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1_d.ch b/src/lzo1_d.ch index e4dff04..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-2014 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,4 @@ #endif - -/* -vi:ts=4:et -*/ - +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1a.c b/src/lzo1a.c index e0894f6..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-2014 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 @@ -27,7 +27,7 @@ #include "lzo_conf.h" -#include "lzo/lzo1a.h" +#include <lzo/lzo1a.h> /*********************************************************************** @@ -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 */ @@ -640,6 +640,4 @@ lzo1a_compress ( const lzo_bytep in , lzo_uint in_len, } -/* -vi:ts=4:et -*/ +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1a_99.c b/src/lzo1a_99.c index 0feddbd..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-2014 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 @@ -113,6 +113,4 @@ LZO_COMPRESS ( const lzo_bytep in, lzo_uint in_len, } -/* -vi:ts=4:et -*/ +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1a_cm.ch b/src/lzo1a_cm.ch index 75289d5..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-2014 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 */ @@ -225,6 +225,4 @@ assert(ii == ip); -/* -vi:ts=4:et -*/ +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1a_cr.ch b/src/lzo1a_cr.ch index cc1f7b4..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-2014 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 @@ -110,7 +110,5 @@ store_run(lzo_bytep const oo, const lzo_bytep const ii, lzo_uint r_len) #endif /* already included */ -/* -vi:ts=4:et -*/ +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1a_de.h b/src/lzo1a_de.h index 28c4be7..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-2014 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 @@ -140,7 +140,5 @@ RBITS | MBITS MIN THR. MSIZE MAXS MINL MAXL MAXO R0MAX R0FAST #endif /* already included */ -/* -vi:ts=4:et -*/ +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1b_1.c b/src/lzo1b_1.c index 7dfa93a..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-2014 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 @@ -32,3 +32,4 @@ #define CLEVEL 1 #include "compr1b.h" +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1b_2.c b/src/lzo1b_2.c index cfe8adf..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-2014 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 @@ -32,3 +32,4 @@ #define CLEVEL 2 #include "compr1b.h" +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1b_3.c b/src/lzo1b_3.c index b105995..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-2014 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 @@ -32,3 +32,4 @@ #define CLEVEL 3 #include "compr1b.h" +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1b_4.c b/src/lzo1b_4.c index c666d6d..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-2014 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 @@ -32,3 +32,4 @@ #define CLEVEL 2 #include "compr1b.h" +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1b_5.c b/src/lzo1b_5.c index 67e9fac..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-2014 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 @@ -32,3 +32,4 @@ #define CLEVEL 3 #include "compr1b.h" +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1b_6.c b/src/lzo1b_6.c index bdbcce8..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-2014 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 @@ -32,3 +32,4 @@ #define CLEVEL 5 #include "compr1b.h" +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1b_7.c b/src/lzo1b_7.c index 1d415e0..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-2014 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 @@ -32,3 +32,4 @@ #define CLEVEL 3 #include "compr1b.h" +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1b_8.c b/src/lzo1b_8.c index a0cb8e1..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-2014 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 @@ -32,3 +32,4 @@ #define CLEVEL 8 #include "compr1b.h" +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1b_9.c b/src/lzo1b_9.c index 9eb51d6..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-2014 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 @@ -32,3 +32,4 @@ #define CLEVEL 9 #include "compr1b.h" +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1b_99.c b/src/lzo1b_99.c index b39e145..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-2014 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 @@ -35,3 +35,4 @@ #define MATCH_IP_END in_end #include "compr1b.h" +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1b_9x.c b/src/lzo1b_9x.c index b1c9a1b..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-2014 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 @@ -347,7 +347,4 @@ lzo1b_999_compress ( const lzo_bytep in , lzo_uint in_len, } -/* -vi:ts=4:et -*/ - +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1b_c.ch b/src/lzo1b_c.ch index 4fb79d4..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-2014 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 @@ -259,6 +259,4 @@ match: #endif -/* -vi:ts=4:et -*/ +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1b_cc.c b/src/lzo1b_cc.c index cf597d5..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-2014 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 @@ -34,10 +34,11 @@ // compression internal entry point. ************************************************************************/ -int _lzo1b_do_compress ( const lzo_bytep in, lzo_uint in_len, - lzo_bytep out, lzo_uintp out_len, - lzo_voidp wrkmem, - lzo_compress_t func ) +LZO_LOCAL_IMPL(int) +_lzo1b_do_compress ( const lzo_bytep in, lzo_uint in_len, + lzo_bytep out, lzo_uintp out_len, + lzo_voidp wrkmem, + lzo_compress_t func ) { int r; #if defined(LZO_TEST_COMPRESS_OVERRUN) @@ -149,7 +150,4 @@ void _lzo1b_stats_calc(lzo_stats_t *lzo_stats) #endif -/* -vi:ts=4:et -*/ - +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1b_cc.h b/src/lzo1b_cc.h index d92a095..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-2014 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 @@ -57,25 +57,21 @@ extern const lzo_compress_t _lzo1b_99_compress_func; // ************************************************************************/ -LZO_EXTERN(lzo_bytep ) +LZO_LOCAL_DECL(lzo_bytep ) _lzo1b_store_run ( lzo_bytep const oo, const lzo_bytep const ii, lzo_uint r_len); #define STORE_RUN _lzo1b_store_run -lzo_compress_t _lzo1b_get_compress_func(int clevel); - -int _lzo1b_do_compress ( const lzo_bytep in, lzo_uint in_len, - lzo_bytep out, lzo_uintp out_len, - lzo_voidp wrkmem, - lzo_compress_t func ); +LZO_LOCAL_DECL(int) +_lzo1b_do_compress ( const lzo_bytep in, lzo_uint in_len, + lzo_bytep out, lzo_uintp out_len, + lzo_voidp wrkmem, + lzo_compress_t func ); #endif /* already included */ -/* -vi:ts=4:et -*/ - +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1b_cm.ch b/src/lzo1b_cm.ch index 2a90b50..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-2014 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); } @@ -277,6 +277,4 @@ assert(ii == ip); -/* -vi:ts=4:et -*/ +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1b_cr.ch b/src/lzo1b_cr.ch index faf12e2..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-2014 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 @@ -109,6 +109,4 @@ assert(ii == ip); -/* -vi:ts=4:et -*/ +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1b_d.ch b/src/lzo1b_d.ch index cf25357..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-2014 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 @@ -265,7 +265,4 @@ lookbehind_overrun: } -/* -vi:ts=4:et -*/ - +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1b_d1.c b/src/lzo1b_d1.c index cd52b25..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-2014 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 @@ -32,3 +32,5 @@ #define DO_DECOMPRESS lzo1b_decompress #include "lzo1b_d.ch" + +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1b_d2.c b/src/lzo1b_d2.c index 879b4ae..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-2014 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 @@ -32,3 +32,5 @@ #define DO_DECOMPRESS lzo1b_decompress_safe #include "lzo1b_d.ch" + +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1b_de.h b/src/lzo1b_de.h index c88ee61..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-2014 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 @@ -326,7 +326,5 @@ extern "C" { #endif /* already included */ -/* -vi:ts=4:et -*/ +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1b_r.ch b/src/lzo1b_r.ch index d6ca5fa..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-2014 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 @@ -30,7 +30,7 @@ // store a literal run (internal) ************************************************************************/ -LZO_PUBLIC(lzo_bytep ) +LZO_LOCAL_IMPL(lzo_bytep ) STORE_RUN ( lzo_bytep const oo, const lzo_bytep const ii, lzo_uint r_len) { lzo_bytep op; @@ -99,7 +99,4 @@ STORE_RUN ( lzo_bytep const oo, const lzo_bytep const ii, lzo_uint r_len) } -/* -vi:ts=4:et -*/ - +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1b_rr.c b/src/lzo1b_rr.c index 6442ea8..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-2014 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 @@ -29,3 +29,5 @@ #include "config1b.h" #include "lzo1b_r.ch" + +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1b_sm.ch b/src/lzo1b_sm.ch index 032ec41..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-2014 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); } @@ -193,6 +193,4 @@ #endif /* (DD_BITS == 0) */ -/* -vi:ts=4:et -*/ +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1b_tm.ch b/src/lzo1b_tm.ch index 96b96f0..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-2014 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 @@ -81,7 +81,4 @@ try_match: #endif /* (DD_BITS == 0) */ - -/* -vi:ts=4:et -*/ +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1b_xx.c b/src/lzo1b_xx.c index 21eec0a..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-2014 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 @@ -47,7 +47,7 @@ static const lzo_compress_t * const c_funcs [9] = }; -lzo_compress_t _lzo1b_get_compress_func(int clevel) +static lzo_compress_t lzo1b_get_compress_func(int clevel) { const lzo_compress_t *f; @@ -56,7 +56,7 @@ lzo_compress_t _lzo1b_get_compress_func(int clevel) if (clevel == LZO1B_DEFAULT_COMPRESSION) clevel = LZO1B_BEST_SPEED; else - return 0; + return (lzo_compress_t) 0; } f = c_funcs[clevel-1]; assert(f && *f); @@ -72,15 +72,11 @@ lzo1b_compress ( const lzo_bytep src, lzo_uint src_len, { lzo_compress_t f; - f = _lzo1b_get_compress_func(clevel); + f = lzo1b_get_compress_func(clevel); if (!f) return LZO_E_ERROR; return _lzo1b_do_compress(src,src_len,dst,dst_len,wrkmem,f); } - -/* -vi:ts=4:et -*/ - +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1c_1.c b/src/lzo1c_1.c index fa9ae7d..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-2014 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 @@ -32,3 +32,4 @@ #define CLEVEL 1 #include "compr1c.h" +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1c_2.c b/src/lzo1c_2.c index eb48954..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-2014 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 @@ -32,3 +32,4 @@ #define CLEVEL 2 #include "compr1c.h" +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1c_3.c b/src/lzo1c_3.c index cd6b861..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-2014 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 @@ -32,3 +32,4 @@ #define CLEVEL 3 #include "compr1c.h" +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1c_4.c b/src/lzo1c_4.c index 81eafa5..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-2014 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 @@ -32,3 +32,4 @@ #define CLEVEL 2 #include "compr1c.h" +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1c_5.c b/src/lzo1c_5.c index b2fa252..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-2014 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 @@ -32,3 +32,4 @@ #define CLEVEL 3 #include "compr1c.h" +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1c_6.c b/src/lzo1c_6.c index 4476004..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-2014 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 @@ -32,3 +32,4 @@ #define CLEVEL 5 #include "compr1c.h" +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1c_7.c b/src/lzo1c_7.c index 0b16c07..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-2014 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 @@ -32,3 +32,4 @@ #define CLEVEL 3 #include "compr1c.h" +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1c_8.c b/src/lzo1c_8.c index 727f2fc..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-2014 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 @@ -32,3 +32,4 @@ #define CLEVEL 8 #include "compr1c.h" +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1c_9.c b/src/lzo1c_9.c index 6705bd7..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-2014 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 @@ -32,3 +32,4 @@ #define CLEVEL 9 #include "compr1c.h" +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1c_99.c b/src/lzo1c_99.c index bec243b..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-2014 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 @@ -35,3 +35,4 @@ #define MATCH_IP_END in_end #include "compr1c.h" +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1c_9x.c b/src/lzo1c_9x.c index 9a7d6d0..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-2014 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 @@ -361,7 +361,4 @@ lzo1c_999_compress ( const lzo_bytep in , lzo_uint in_len, } -/* -vi:ts=4:et -*/ - +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1c_cc.c b/src/lzo1c_cc.c index f6999db..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-2014 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 @@ -34,10 +34,11 @@ // compression internal entry point. ************************************************************************/ -int _lzo1c_do_compress ( const lzo_bytep in, lzo_uint in_len, - lzo_bytep out, lzo_uintp out_len, - lzo_voidp wrkmem, - lzo_compress_t func ) +LZO_LOCAL_IMPL(int) +_lzo1c_do_compress ( const lzo_bytep in, lzo_uint in_len, + lzo_bytep out, lzo_uintp out_len, + lzo_voidp wrkmem, + lzo_compress_t func ) { int r; #if defined(LZO_TEST_COMPRESS_OVERRUN) @@ -149,7 +150,4 @@ void _lzo1c_stats_calc(lzo_stats_t *lzo_stats) #endif -/* -vi:ts=4:et -*/ - +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1c_cc.h b/src/lzo1c_cc.h index ff63ff0..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-2014 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 @@ -57,25 +57,21 @@ extern const lzo_compress_t _lzo1c_99_compress_func; // ************************************************************************/ -LZO_EXTERN(lzo_bytep ) +LZO_LOCAL_DECL(lzo_bytep ) _lzo1c_store_run ( lzo_bytep const oo, const lzo_bytep const ii, lzo_uint r_len); #define STORE_RUN _lzo1c_store_run -lzo_compress_t _lzo1c_get_compress_func(int clevel); - -int _lzo1c_do_compress ( const lzo_bytep in, lzo_uint in_len, - lzo_bytep out, lzo_uintp out_len, - lzo_voidp wrkmem, - lzo_compress_t func ); +LZO_LOCAL_DECL(int) +_lzo1c_do_compress ( const lzo_bytep in, lzo_uint in_len, + lzo_bytep out, lzo_uintp out_len, + lzo_voidp wrkmem, + lzo_compress_t func ); #endif /* already included */ -/* -vi:ts=4:et -*/ - +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1c_d1.c b/src/lzo1c_d1.c index 63b6eaf..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-2014 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 @@ -32,3 +32,5 @@ #define DO_DECOMPRESS lzo1c_decompress #include "lzo1b_d.ch" + +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1c_d2.c b/src/lzo1c_d2.c index 64bc8e6..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-2014 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 @@ -46,3 +46,5 @@ LZO_PUBLIC(int) lzo1c_decompress_asm_safe return lzo1c_decompress_safe(src, src_len, dst, dst_len, wrkmem); } #endif + +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1c_rr.c b/src/lzo1c_rr.c index 860d36e..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-2014 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 @@ -29,3 +29,5 @@ #include "config1c.h" #include "lzo1b_r.ch" + +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1c_xx.c b/src/lzo1c_xx.c index 7a0e594..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-2014 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 @@ -47,7 +47,7 @@ static const lzo_compress_t * const c_funcs [9] = }; -lzo_compress_t _lzo1c_get_compress_func(int clevel) +static lzo_compress_t lzo1c_get_compress_func(int clevel) { const lzo_compress_t *f; @@ -56,7 +56,7 @@ lzo_compress_t _lzo1c_get_compress_func(int clevel) if (clevel == LZO1C_DEFAULT_COMPRESSION) clevel = LZO1C_BEST_SPEED; else - return 0; + return (lzo_compress_t) 0; } f = c_funcs[clevel-1]; assert(f && *f); @@ -72,15 +72,11 @@ lzo1c_compress ( const lzo_bytep src, lzo_uint src_len, { lzo_compress_t f; - f = _lzo1c_get_compress_func(clevel); + f = lzo1c_get_compress_func(clevel); if (!f) return LZO_E_ERROR; return _lzo1c_do_compress(src,src_len,dst,dst_len,wrkmem,f); } - -/* -vi:ts=4:et -*/ - +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1f_1.c b/src/lzo1f_1.c index 0f8612e..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-2014 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 @@ -27,7 +27,7 @@ #include "lzo_conf.h" -#include "lzo/lzo1f.h" +#include <lzo/lzo1f.h> /*********************************************************************** @@ -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); @@ -298,7 +298,4 @@ lzo1f_1_compress ( const lzo_bytep in , lzo_uint in_len, } -/* -vi:ts=4:et -*/ - +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1f_9x.c b/src/lzo1f_9x.c index eb78d8c..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-2014 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 @@ -327,7 +327,4 @@ lzo1f_999_compress ( const lzo_bytep in , lzo_uint in_len, } -/* -vi:ts=4:et -*/ - +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1f_d.ch b/src/lzo1f_d.ch index b22916e..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-2014 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 @@ -207,7 +207,4 @@ lookbehind_overrun: } -/* -vi:ts=4:et -*/ - +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1f_d1.c b/src/lzo1f_d1.c index 0c50558..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-2014 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 @@ -32,3 +32,5 @@ #define DO_DECOMPRESS lzo1f_decompress #include "lzo1f_d.ch" + +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1f_d2.c b/src/lzo1f_d2.c index b762a7a..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-2014 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 @@ -46,3 +46,5 @@ LZO_PUBLIC(int) lzo1f_decompress_asm_fast_safe return lzo1f_decompress_safe(src, src_len, dst, dst_len, wrkmem); } #endif + +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1x_1.c b/src/lzo1x_1.c index 2bdecce..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-2014 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 @@ -53,3 +53,5 @@ #endif #include "lzo1x_c.ch" + +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1x_1k.c b/src/lzo1x_1k.c index cbfa234..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-2014 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 @@ -53,3 +53,5 @@ #endif #include "lzo1x_c.ch" + +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1x_1l.c b/src/lzo1x_1l.c index ee857bc..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-2014 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 @@ -53,3 +53,5 @@ #endif #include "lzo1x_c.ch" + +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1x_1o.c b/src/lzo1x_1o.c index 28fdaff..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-2014 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 @@ -54,3 +54,5 @@ #endif #include "lzo1x_c.ch" + +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1x_9x.c b/src/lzo1x_9x.c index 9de75df..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-2014 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 @@ -109,7 +109,7 @@ code_match ( LZO_COMPRESS_T *c, lzo_bytep op, lzo_uint m_len, lzo_uint m_off ) lzo_uint x_len = m_len; lzo_uint x_off = m_off; - c->match_bytes += (unsigned long) m_len; + c->match_bytes += m_len; #if 0 /* @@ -265,7 +265,7 @@ code_match ( LZO_COMPRESS_T *c, lzo_bytep op, lzo_uint m_len, lzo_uint m_off ) static lzo_bytep STORE_RUN ( LZO_COMPRESS_T *c, lzo_bytep op, const lzo_bytep ii, lzo_uint t ) { - c->lit_bytes += (unsigned long) t; + c->lit_bytes += t; if (op == c->out && t <= 238) { @@ -864,7 +864,4 @@ lzo1x_999_compress ( const lzo_bytep in , lzo_uint in_len, } -/* -vi:ts=4:et -*/ - +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1x_c.ch b/src/lzo1x_c.ch index 805f71d..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-2014 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 @@ -400,6 +400,4 @@ DO_COMPRESS ( const lzo_bytep in , lzo_uint in_len, } -/* -vi:ts=4:et -*/ +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1x_d.ch b/src/lzo1x_d.ch index aa0a8e0..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-2014 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 @@ -472,7 +472,4 @@ lookbehind_overrun: } -/* -vi:ts=4:et -*/ - +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1x_d1.c b/src/lzo1x_d1.c index 2342afd..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-2014 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 @@ -32,3 +32,5 @@ #define DO_DECOMPRESS lzo1x_decompress #include "lzo1x_d.ch" + +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1x_d2.c b/src/lzo1x_d2.c index 477522c..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-2014 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 @@ -57,3 +57,5 @@ LZO_PUBLIC(int) lzo1x_decompress_asm_fast_safe return lzo1x_decompress_safe(src, src_len, dst, dst_len, wrkmem); } #endif + +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1x_d3.c b/src/lzo1x_d3.c index 8da0692..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-2014 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 @@ -90,7 +90,4 @@ lzo1x_decompress_dict_safe ( const lzo_bytep in, lzo_uint in_len, #include "lzo1x_d.ch" -/* -vi:ts=4:et -*/ - +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1x_o.c b/src/lzo1x_o.c index 5b3dbaf..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-2014 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,3 +31,5 @@ #define DO_OPTIMIZE lzo1x_optimize #include "lzo1x_oo.ch" + +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1x_oo.ch b/src/lzo1x_oo.ch index ebb406f..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-2014 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; @@ -349,7 +349,4 @@ eof_found: } -/* -vi:ts=4:et -*/ - +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1y_1.c b/src/lzo1y_1.c index dfa4487..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-2014 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 @@ -53,3 +53,5 @@ #endif #include "lzo1x_c.ch" + +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1y_9x.c b/src/lzo1y_9x.c index 464d849..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-2014 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 @@ -28,3 +28,5 @@ #define LZO1Y 1 #include "lzo1x_9x.c" + +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1y_d1.c b/src/lzo1y_d1.c index e10877e..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-2014 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 @@ -32,3 +32,5 @@ #define DO_DECOMPRESS lzo1y_decompress #include "lzo1x_d.ch" + +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1y_d2.c b/src/lzo1y_d2.c index 0aeeec6..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-2014 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 @@ -57,3 +57,5 @@ LZO_PUBLIC(int) lzo1y_decompress_asm_fast_safe return lzo1y_decompress_safe(src, src_len, dst, dst_len, wrkmem); } #endif + +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1y_d3.c b/src/lzo1y_d3.c index 494a5f5..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-2014 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,3 +31,5 @@ #define lzo1x_decompress_dict_safe lzo1y_decompress_dict_safe #include "lzo1x_d3.c" + +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1y_o.c b/src/lzo1y_o.c index 27abd46..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-2014 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,3 +31,5 @@ #define DO_OPTIMIZE lzo1y_optimize #include "lzo1x_oo.ch" + +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1z_9x.c b/src/lzo1z_9x.c index 579b161..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-2014 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 @@ -28,3 +28,5 @@ #define LZO1Z 1 #include "lzo1x_9x.c" + +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1z_d1.c b/src/lzo1z_d1.c index 81cc02a..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-2014 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 @@ -32,3 +32,5 @@ #define DO_DECOMPRESS lzo1z_decompress #include "lzo1x_d.ch" + +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1z_d2.c b/src/lzo1z_d2.c index 2a132e6..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-2014 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 @@ -32,3 +32,5 @@ #define DO_DECOMPRESS lzo1z_decompress_safe #include "lzo1x_d.ch" + +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo1z_d3.c b/src/lzo1z_d3.c index d82dc32..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-2014 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,3 +31,5 @@ #define lzo1x_decompress_dict_safe lzo1z_decompress_dict_safe #include "lzo1x_d3.c" + +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo2a_9x.c b/src/lzo2a_9x.c index 2fec38c..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-2014 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 @@ -343,7 +343,4 @@ lzo2a_999_compress ( const lzo_bytep in , lzo_uint in_len, } -/* -vi:ts=4:et -*/ - +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo2a_d.ch b/src/lzo2a_d.ch index 1f4acf1..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-2014 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 @@ -171,7 +171,4 @@ lookbehind_overrun: } -/* -vi:ts=4:et -*/ - +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo2a_d1.c b/src/lzo2a_d1.c index a32f4cd..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-2014 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 @@ -32,3 +32,5 @@ #define DO_DECOMPRESS lzo2a_decompress #include "lzo2a_d.ch" + +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo2a_d2.c b/src/lzo2a_d2.c index c3c3bed..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-2014 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 @@ -32,3 +32,5 @@ #define DO_DECOMPRESS lzo2a_decompress_safe #include "lzo2a_d.ch" + +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo_conf.h b/src/lzo_conf.h index cc2e85d..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-2014 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 @@ -46,13 +46,26 @@ #if defined(__LZOCONF_H) || defined(__LZOCONF_H_INCLUDED) # error "include this file first" #endif -#include "lzo/lzoconf.h" +#if defined(LZO_CFG_BUILD_DLL) && (LZO_CFG_BUILD_DLL+0) && !defined(__LZO_EXPORT1) && !defined(__LZO_EXPORT2) && 0 + /* idea: we could auto-define __LZO_EXPORT1 for DLL exports */ +#ifndef __LZODEFS_H_INCLUDED +#if defined(LZO_HAVE_CONFIG_H) +# include <config.h> +#endif +#include <limits.h> +#include <stddef.h> +#include <lzo/lzodefs.h> +#endif + /* #define __LZO_EXPORT1 __attribute__((__visibility__("default"))) */ + /* #define __LZO_EXPORT1 __declspec(dllexport) */ +#endif +#include <lzo/lzoconf.h> #if defined(LZO_CFG_EXTRA_CONFIG_HEADER2) # include LZO_CFG_EXTRA_CONFIG_HEADER2 #endif -#endif +#endif /* !defined(__LZO_IN_MINILZO) */ -#if (LZO_VERSION < 0x2080) || !defined(__LZOCONF_H_INCLUDED) +#if !defined(__LZOCONF_H_INCLUDED) || (LZO_VERSION+0 != 0x20a0) # error "version mismatch" #endif @@ -78,6 +91,10 @@ /* disable '-Wall' warnings in system header files */ # pragma warning(disable: 4746) #endif +#if (LZO_CC_INTELC && (__INTEL_COMPILER >= 900)) + /* disable pedantic warnings in system header files */ +# pragma warning(disable: 1684) +#endif #if (LZO_CC_SUNPROC) #if !defined(__cplusplus) @@ -89,6 +106,37 @@ /*********************************************************************** +// function types +************************************************************************/ + +#if !defined(__LZO_NOEXPORT1) +# define __LZO_NOEXPORT1 /*empty*/ +#endif +#if !defined(__LZO_NOEXPORT2) +# define __LZO_NOEXPORT2 /*empty*/ +#endif + +#if 1 +# define LZO_PUBLIC_DECL(r) LZO_EXTERN(r) +#endif +#if 1 +# define LZO_PUBLIC_IMPL(r) LZO_PUBLIC(r) +#endif +#if !defined(LZO_LOCAL_DECL) +# define LZO_LOCAL_DECL(r) __LZO_EXTERN_C LZO_LOCAL_IMPL(r) +#endif +#if !defined(LZO_LOCAL_IMPL) +# define LZO_LOCAL_IMPL(r) __LZO_NOEXPORT1 r __LZO_NOEXPORT2 __LZO_CDECL +#endif +#if 1 +# define LZO_STATIC_DECL(r) LZO_PRIVATE(r) +#endif +#if 1 +# define LZO_STATIC_IMPL(r) LZO_PRIVATE(r) +#endif + + +/*********************************************************************** // ************************************************************************/ @@ -384,7 +432,5 @@ LZO_EXTERN(const lzo_bytep) lzo_copyright(void); #endif /* already included */ -/* -vi:ts=4:et -*/ +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo_crc.c b/src/lzo_crc.c index 94af1c3..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-2014 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/ ************************************************************************/ @@ -150,6 +150,4 @@ lzo_crc32(lzo_uint32_t c, const lzo_bytep buf, lzo_uint len) #undef LZO_DO16 -/* -vi:ts=4:et -*/ +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo_dict.h b/src/lzo_dict.h index c3dd52b..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-2014 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 @@ -207,7 +207,7 @@ extern "C" { #if !defined(DVAL_ASSERT) #if defined(__LZO_HASH_INCREMENTAL) && !defined(NDEBUG) -#if (LZO_CC_CLANG || (LZO_CC_GNUC >= 0x020700ul) || LZO_CC_LLVM) +#if 1 && (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || (LZO_CC_GNUC >= 0x020700ul) || LZO_CC_INTELC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE || LZO_CC_PGI) static void __attribute__((__unused__)) #else static void @@ -303,7 +303,5 @@ DVAL_ASSERT(lzo_xint dv, const lzo_bytep p) #endif /* already included */ -/* -vi:ts=4:et -*/ +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo_dll.ch b/src/lzo_dll.ch index 3b80edf..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-2014 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 @@ -47,6 +47,4 @@ int __far __pascal LibMain ( int a, short b, short c, long d ) #endif -/* -vi:ts=4:et -*/ +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo_func.h b/src/lzo_func.h index dfaa676..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-2014 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 @@ -74,6 +74,9 @@ __lzo_static_forceinline unsigned lzo_bitops_ctlz32_func(lzo_uint32_t v) #elif (LZO_BITOPS_USE_GNUC_BITSCAN) && (LZO_SIZEOF_INT == 4) unsigned r; r = (unsigned) __builtin_clz(v); return r; #define lzo_bitops_ctlz32(v) ((unsigned) __builtin_clz(v)) +#elif (LZO_BITOPS_USE_GNUC_BITSCAN) && (LZO_SIZEOF_LONG == 8) && (LZO_WORDSIZE >= 8) + unsigned r; r = (unsigned) __builtin_clzl(v); return r ^ 32; +#define lzo_bitops_ctlz32(v) (((unsigned) __builtin_clzl(v)) ^ 32) #else LZO_UNUSED(v); return 0; #endif @@ -143,20 +146,15 @@ __lzo_static_forceinline unsigned lzo_bitops_cttz64_func(lzo_uint64_t v) } #endif -#if 1 && (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || (LZO_CC_GNUC >= 0x020700ul) || LZO_CC_INTELC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE || LZO_CC_PGI) -static void __attribute__((__unused__)) -#else -__lzo_static_forceinline void -#endif -lzo_bitops_unused_funcs(void) +lzo_unused_funcs_impl(void, lzo_bitops_unused_funcs)(void) { + LZO_UNUSED_FUNC(lzo_bitops_unused_funcs); LZO_UNUSED_FUNC(lzo_bitops_ctlz32_func); LZO_UNUSED_FUNC(lzo_bitops_cttz32_func); #if defined(lzo_uint64_t) LZO_UNUSED_FUNC(lzo_bitops_ctlz64_func); LZO_UNUSED_FUNC(lzo_bitops_cttz64_func); #endif - LZO_UNUSED_FUNC(lzo_bitops_unused_funcs); } @@ -165,8 +163,9 @@ lzo_bitops_unused_funcs(void) ************************************************************************/ #if defined(__lzo_alignof) && !(LZO_CFG_NO_UNALIGNED) -#ifndef __lzo_memops_tcheck -#define __lzo_memops_tcheck(t,a,b) ((void)0, sizeof(t) == (a) && __lzo_alignof(t) == (b)) +/* CBUG: disabled because of gcc bug 64516 */ +#if !defined(lzo_memops_tcheck__) && 0 +#define lzo_memops_tcheck__(t,a,b) ((void)0, sizeof(t) == (a) && __lzo_alignof(t) == (b)) #endif #endif #ifndef lzo_memops_TU0p @@ -283,9 +282,9 @@ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(*(lzo_memops_TU1p)0)==1) LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(*(lzo_memops_TU2p)0)==2) #define LZO_MEMOPS_COPY2(dd,ss) \ * (lzo_memops_TU2p) (lzo_memops_TU0p) (dd) = * (const lzo_memops_TU2p) (const lzo_memops_TU0p) (ss) -#elif defined(__lzo_memops_tcheck) +#elif defined(lzo_memops_tcheck__) #define LZO_MEMOPS_COPY2(dd,ss) \ - LZO_BLOCK_BEGIN if (__lzo_memops_tcheck(lzo_memops_TU2,2,1)) { \ + LZO_BLOCK_BEGIN if (lzo_memops_tcheck__(lzo_memops_TU2,2,1)) { \ * (lzo_memops_TU2p) (lzo_memops_TU0p) (dd) = * (const lzo_memops_TU2p) (const lzo_memops_TU0p) (ss); \ } else { LZO_MEMOPS_MOVE2(dd,ss); } LZO_BLOCK_END #else @@ -295,9 +294,9 @@ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(*(lzo_memops_TU2p)0)==2) LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(*(lzo_memops_TU4p)0)==4) #define LZO_MEMOPS_COPY4(dd,ss) \ * (lzo_memops_TU4p) (lzo_memops_TU0p) (dd) = * (const lzo_memops_TU4p) (const lzo_memops_TU0p) (ss) -#elif defined(__lzo_memops_tcheck) +#elif defined(lzo_memops_tcheck__) #define LZO_MEMOPS_COPY4(dd,ss) \ - LZO_BLOCK_BEGIN if (__lzo_memops_tcheck(lzo_memops_TU4,4,1)) { \ + LZO_BLOCK_BEGIN if (lzo_memops_tcheck__(lzo_memops_TU4,4,1)) { \ * (lzo_memops_TU4p) (lzo_memops_TU0p) (dd) = * (const lzo_memops_TU4p) (const lzo_memops_TU0p) (ss); \ } else { LZO_MEMOPS_MOVE4(dd,ss); } LZO_BLOCK_END #else @@ -314,9 +313,9 @@ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(*(lzo_memops_TU8p)0)==8) #elif (LZO_OPT_UNALIGNED32) #define LZO_MEMOPS_COPY8(dd,ss) \ LZO_BLOCK_BEGIN LZO_MEMOPS_COPY4(dd,ss); LZO_MEMOPS_COPY4((lzo_memops_TU1p)(lzo_memops_TU0p)(dd)+4,(const lzo_memops_TU1p)(const lzo_memops_TU0p)(ss)+4); LZO_BLOCK_END -#elif defined(__lzo_memops_tcheck) +#elif defined(lzo_memops_tcheck__) #define LZO_MEMOPS_COPY8(dd,ss) \ - LZO_BLOCK_BEGIN if (__lzo_memops_tcheck(lzo_memops_TU8,8,1)) { \ + LZO_BLOCK_BEGIN if (lzo_memops_tcheck__(lzo_memops_TU8,8,1)) { \ * (lzo_memops_TU8p) (lzo_memops_TU0p) (dd) = * (const lzo_memops_TU8p) (const lzo_memops_TU0p) (ss); \ } else { LZO_MEMOPS_MOVE8(dd,ss); } LZO_BLOCK_END #else @@ -350,7 +349,7 @@ __lzo_static_forceinline lzo_uint16_t lzo_memops_get_le16(const lzo_voidp ss) return v; } #if (LZO_OPT_UNALIGNED16) && (LZO_ABI_LITTLE_ENDIAN) -#define LZO_MEMOPS_GET_LE16(ss) * (const lzo_memops_TU2p) (const lzo_memops_TU0p) (ss) +#define LZO_MEMOPS_GET_LE16(ss) (* (const lzo_memops_TU2p) (const lzo_memops_TU0p) (ss)) #else #define LZO_MEMOPS_GET_LE16(ss) lzo_memops_get_le16(ss) #endif @@ -372,13 +371,13 @@ __lzo_static_forceinline lzo_uint32_t lzo_memops_get_le32(const lzo_voidp ss) return v; } #if (LZO_OPT_UNALIGNED32) && (LZO_ABI_LITTLE_ENDIAN) -#define LZO_MEMOPS_GET_LE32(ss) * (const lzo_memops_TU4p) (const lzo_memops_TU0p) (ss) +#define LZO_MEMOPS_GET_LE32(ss) (* (const lzo_memops_TU4p) (const lzo_memops_TU0p) (ss)) #else #define LZO_MEMOPS_GET_LE32(ss) lzo_memops_get_le32(ss) #endif #if (LZO_OPT_UNALIGNED64) && (LZO_ABI_LITTLE_ENDIAN) -#define LZO_MEMOPS_GET_LE64(ss) * (const lzo_memops_TU8p) (const lzo_memops_TU0p) (ss) +#define LZO_MEMOPS_GET_LE64(ss) (* (const lzo_memops_TU8p) (const lzo_memops_TU0p) (ss)) #endif __lzo_static_forceinline lzo_uint16_t lzo_memops_get_ne16(const lzo_voidp ss) @@ -388,7 +387,8 @@ __lzo_static_forceinline lzo_uint16_t lzo_memops_get_ne16(const lzo_voidp ss) return v; } #if (LZO_OPT_UNALIGNED16) -#define LZO_MEMOPS_GET_NE16(ss) * (const lzo_memops_TU2p) (const lzo_memops_TU0p) (ss) +LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(*(lzo_memops_TU2p)0)==2) +#define LZO_MEMOPS_GET_NE16(ss) (* (const lzo_memops_TU2p) (const lzo_memops_TU0p) (ss)) #else #define LZO_MEMOPS_GET_NE16(ss) lzo_memops_get_ne16(ss) #endif @@ -400,13 +400,15 @@ __lzo_static_forceinline lzo_uint32_t lzo_memops_get_ne32(const lzo_voidp ss) return v; } #if (LZO_OPT_UNALIGNED32) -#define LZO_MEMOPS_GET_NE32(ss) * (const lzo_memops_TU4p) (const lzo_memops_TU0p) (ss) +LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(*(lzo_memops_TU4p)0)==4) +#define LZO_MEMOPS_GET_NE32(ss) (* (const lzo_memops_TU4p) (const lzo_memops_TU0p) (ss)) #else #define LZO_MEMOPS_GET_NE32(ss) lzo_memops_get_ne32(ss) #endif #if (LZO_OPT_UNALIGNED64) -#define LZO_MEMOPS_GET_NE64(ss) * (const lzo_memops_TU8p) (const lzo_memops_TU0p) (ss) +LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(*(lzo_memops_TU8p)0)==8) +#define LZO_MEMOPS_GET_NE64(ss) (* (const lzo_memops_TU8p) (const lzo_memops_TU0p) (ss)) #endif __lzo_static_forceinline void lzo_memops_put_le16(lzo_voidp dd, lzo_uint16_t vv) @@ -471,13 +473,9 @@ __lzo_static_forceinline void lzo_memops_put_ne32(lzo_voidp dd, lzo_uint32_t vv) #define LZO_MEMOPS_PUT_NE32(dd,vv) lzo_memops_put_ne32(dd,vv) #endif -#if 1 && (LZO_CC_ARMCC_GNUC || LZO_CC_CLANG || (LZO_CC_GNUC >= 0x020700ul) || LZO_CC_INTELC_GNUC || LZO_CC_LLVM || LZO_CC_PATHSCALE || LZO_CC_PGI) -static void __attribute__((__unused__)) -#else -__lzo_static_forceinline void -#endif -lzo_memops_unused_funcs(void) +lzo_unused_funcs_impl(void, lzo_memops_unused_funcs)(void) { + LZO_UNUSED_FUNC(lzo_memops_unused_funcs); LZO_UNUSED_FUNC(lzo_memops_get_le16); LZO_UNUSED_FUNC(lzo_memops_get_le32); LZO_UNUSED_FUNC(lzo_memops_get_ne16); @@ -486,7 +484,6 @@ lzo_memops_unused_funcs(void) LZO_UNUSED_FUNC(lzo_memops_put_le32); LZO_UNUSED_FUNC(lzo_memops_put_ne16); LZO_UNUSED_FUNC(lzo_memops_put_ne32); - LZO_UNUSED_FUNC(lzo_memops_unused_funcs); } #endif /* already included */ diff --git a/src/lzo_init.c b/src/lzo_init.c index a1d9dd0..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-2014 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 @@ -236,6 +236,4 @@ __lzo_init_v2(unsigned v, int s1, int s2, int s3, int s4, int s5, #endif -/* -vi:ts=4:et -*/ +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo_mchw.ch b/src/lzo_mchw.ch index 8273612..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-2014 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 @@ -55,16 +55,16 @@ typedef struct lzo_uint printcount; /* counter for reporting progress every 1K bytes */ /* some stats */ - unsigned long lit_bytes; - unsigned long match_bytes; - unsigned long rep_bytes; - unsigned long lazy; + lzo_uint lit_bytes; + lzo_uint match_bytes; + lzo_uint rep_bytes; + lzo_uint lazy; #if defined(LZO1B) lzo_uint r1_m_len; /* some stats */ - unsigned long r1_r, m3_r, m2_m, m3_m; + lzo_uint r1_r, m3_r, m2_m, m3_m; #endif #if defined(LZO1C) @@ -72,7 +72,7 @@ typedef struct lzo_bytep m3; /* some stats */ - unsigned long r1_r, m3_r, m2_m, m3_m; + lzo_uint r1_r, m3_r, m2_m, m3_m; #endif #if defined(LZO1F) @@ -80,7 +80,7 @@ typedef struct lzo_uint r1_m_len; /* some stats */ - unsigned long r1_r, m2_m, m3_m; + lzo_uint r1_r, m2_m, m3_m; #endif #if defined(LZO1X) || defined(LZO1Y) || defined(LZO1Z) @@ -88,13 +88,13 @@ typedef struct lzo_uint r1_m_len; /* some stats */ - unsigned long m1a_m, m1b_m, m2_m, m3_m, m4_m; - unsigned long lit1_r, lit2_r, lit3_r; + lzo_uint m1a_m, m1b_m, m2_m, m3_m, m4_m; + lzo_uint lit1_r, lit2_r, lit3_r; #endif #if defined(LZO2A) /* some stats */ - unsigned long m1, m2, m3, m4; + lzo_uint m1, m2, m3, m4; #endif } LZO_COMPRESS_T; @@ -219,7 +219,4 @@ find_match ( LZO_COMPRESS_T *c, lzo_swd_p s, } -/* -vi:ts=4:et -*/ - +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo_ptr.c b/src/lzo_ptr.c index 2896b70..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-2014 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 @@ -61,18 +61,20 @@ __lzo_align_gap(const lzo_voidp ptr, lzo_uint size) #error "__LZO_UINTPTR_T_IS_POINTER is unsupported" #else lzo_uintptr_t p, n; + if (size < 2) return 0; p = __lzo_ptr_linear(ptr); +#if 0 n = (((p + size - 1) / size) * size) - p; +#else + if ((size & (size - 1)) != 0) + return 0; + n = size; n = ((p + n - 1) & ~(n - 1)) - p; +#endif #endif - - assert(size > 0); assert((long)n >= 0); assert(n <= size); return (unsigned)n; } - -/* -vi:ts=4:et -*/ +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo_ptr.h b/src/lzo_ptr.h index 1e23548..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-2014 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 @@ -119,7 +119,5 @@ lzo_full_align_t; #endif /* already included */ -/* -vi:ts=4:et -*/ +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo_str.c b/src/lzo_str.c index a7ca638..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-2014 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 @@ -54,6 +54,4 @@ #undef LZOLIB_PUBLIC -/* -vi:ts=4:et -*/ +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo_supp.h b/src/lzo_supp.h index f7d0351..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-2014 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,34 +1511,33 @@ 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) -#if (SIZEOF_INT >= 2) + 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 (SIZEOF_INT >= 4) +#if (LZO_SIZEOF_INT >= 4) LZOCHK_ASSERT(__LZO_MASK_GEN(1,31) == 2147483647) LZOCHK_ASSERT(__LZO_MASK_GEN(1u,32) == 0xffffffffU) LZOCHK_ASSERT(__LZO_MASK_GEN(0u,32) == 0u) #endif -#if (SIZEOF_LONG >= 4) +#if (LZO_SIZEOF_LONG >= 4) LZOCHK_ASSERT(__LZO_MASK_GEN(1ul,32) == 0xffffffffUL) LZOCHK_ASSERT(__LZO_MASK_GEN(0ul,32) == 0ul) #endif -#if (SIZEOF_LONG >= 8) +#if (LZO_SIZEOF_LONG >= 8) LZOCHK_ASSERT(__LZO_MASK_GEN(1ul,64) == 0xffffffffffffffffUL) LZOCHK_ASSERT(__LZO_MASK_GEN(0ul,64) == 0ul) #endif #if !(LZO_BROKEN_INTEGRAL_PROMOTION) - LZOCHK_ASSERT(__LZO_MASK_GEN(1u,SIZEOF_INT*8) == ~0u) - LZOCHK_ASSERT(__LZO_MASK_GEN(1ul,SIZEOF_LONG*8) == ~0ul) + LZOCHK_ASSERT(__LZO_MASK_GEN(1u,LZO_SIZEOF_INT*8) == ~0u) + LZOCHK_ASSERT(__LZO_MASK_GEN(1ul,LZO_SIZEOF_LONG*8) == ~0ul) #endif #if 1 LZOCHK_ASSERT(__LZO_MASK_GEN(0,0) == 0) @@ -1575,10 +1572,10 @@ LZOLIB_EXTERN(int, lzo_spawnve) (int mode, const char* fn, const char* const * a LZOCHK_ASSERT((~0ul & ~0) == ~0ul) LZOCHK_ASSERT((~0ul & ~0u) == ~0u) #if defined(__MSDOS__) && defined(__TURBOC__) && (__TURBOC__ < 0x0150) -#elif (SIZEOF_INT == 2) +#elif (LZO_SIZEOF_INT == 2) LZOCHK_ASSERT((~0l & ~0u) == 0xffffU) LZOCHK_ASSERT((~0ul & ~0u) == 0xffffU) -#elif (SIZEOF_INT == 4) +#elif (LZO_SIZEOF_INT == 4) LZOCHK_ASSERT((~0l & ~0u) == 0xffffffffU) LZOCHK_ASSERT((~0ul & ~0u) == 0xffffffffU) #endif @@ -1626,8 +1623,8 @@ LZOLIB_EXTERN(int, lzo_spawnve) (int mode, const char* fn, const char* const * a #else LZOCHK_ASSERT(sizeof(short) == sizeof(LZO_STATIC_CAST(short, 0))) #endif -#if (SIZEOF_SHORT > 0) - LZOCHK_ASSERT(sizeof(short) == SIZEOF_SHORT) +#if (LZO_SIZEOF_SHORT > 0) + LZOCHK_ASSERT(sizeof(short) == LZO_SIZEOF_SHORT) #endif LZOCHK_ASSERT_IS_SIGNED_T(int) LZOCHK_ASSERT_IS_UNSIGNED_T(unsigned int) @@ -1638,8 +1635,8 @@ LZOLIB_EXTERN(int, lzo_spawnve) (int mode, const char* fn, const char* const * a LZOCHK_ASSERT(sizeof(int) >= sizeof(short)) LZOCHK_ASSERT(sizeof(int) == sizeof(0)) LZOCHK_ASSERT(sizeof(int) == sizeof(LZO_STATIC_CAST(int, 0))) -#if (SIZEOF_INT > 0) - LZOCHK_ASSERT(sizeof(int) == SIZEOF_INT) +#if (LZO_SIZEOF_INT > 0) + LZOCHK_ASSERT(sizeof(int) == LZO_SIZEOF_INT) #endif LZOCHK_ASSERT(sizeof(0) == sizeof(int)) LZOCHK_ASSERT_IS_SIGNED_T(long) @@ -1651,15 +1648,15 @@ LZOLIB_EXTERN(int, lzo_spawnve) (int mode, const char* fn, const char* const * a LZOCHK_ASSERT(sizeof(long) >= sizeof(int)) LZOCHK_ASSERT(sizeof(long) == sizeof(0L)) LZOCHK_ASSERT(sizeof(long) == sizeof(LZO_STATIC_CAST(long, 0))) -#if (SIZEOF_LONG > 0) - LZOCHK_ASSERT(sizeof(long) == SIZEOF_LONG) +#if (LZO_SIZEOF_LONG > 0) + LZOCHK_ASSERT(sizeof(long) == LZO_SIZEOF_LONG) #endif LZOCHK_ASSERT(sizeof(0L) == sizeof(long)) LZOCHK_ASSERT_IS_UNSIGNED_T(size_t) LZOCHK_ASSERT(sizeof(size_t) >= sizeof(int)) LZOCHK_ASSERT(sizeof(size_t) == sizeof(sizeof(0))) -#if (SIZEOF_SIZE_T > 0) - LZOCHK_ASSERT(sizeof(size_t) == SIZEOF_SIZE_T) +#if (LZO_SIZEOF_SIZE_T > 0) + LZOCHK_ASSERT(sizeof(size_t) == LZO_SIZEOF_SIZE_T) #endif LZOCHK_ASSERT_IS_SIGNED_T(ptrdiff_t) LZOCHK_ASSERT(sizeof(ptrdiff_t) >= sizeof(int)) @@ -1670,13 +1667,13 @@ LZOLIB_EXTERN(int, lzo_spawnve) (int mode, const char* fn, const char* const * a LZOCHK_ASSERT(4 == sizeof(LZO_STATIC_CAST(char __huge*, 0) - LZO_STATIC_CAST(char __huge*, 0))) # endif #endif -#if (SIZEOF_PTRDIFF_T > 0) - LZOCHK_ASSERT(sizeof(ptrdiff_t) == SIZEOF_PTRDIFF_T) +#if (LZO_SIZEOF_PTRDIFF_T > 0) + LZOCHK_ASSERT(sizeof(ptrdiff_t) == LZO_SIZEOF_PTRDIFF_T) #endif LZOCHK_ASSERT(sizeof(void*) >= sizeof(char*)) -#if (SIZEOF_VOID_P > 0) - LZOCHK_ASSERT(sizeof(void*) == SIZEOF_VOID_P) - LZOCHK_ASSERT(sizeof(char*) == SIZEOF_VOID_P) +#if (LZO_SIZEOF_VOID_P > 0) + LZOCHK_ASSERT(sizeof(void*) == LZO_SIZEOF_VOID_P) + LZOCHK_ASSERT(sizeof(char*) == LZO_SIZEOF_VOID_P) #endif #if (LZO_HAVE_MM_HUGE_PTR) LZOCHK_ASSERT(4 == sizeof(void __huge*)) @@ -1692,14 +1689,14 @@ LZOLIB_EXTERN(int, lzo_spawnve) (int mode, const char* fn, const char* const * a #if defined(LZOCHK_CFG_PEDANTIC) #if defined(__MSDOS__) && defined(__TURBOC__) && (__TURBOC__ < 0x0150) #else - LZOCHK_ASSERT((1 << (8*SIZEOF_INT-1)) < 0) + LZOCHK_ASSERT((1 << (8*LZO_SIZEOF_INT-1)) < 0) #endif #endif - LZOCHK_ASSERT((1u << (8*SIZEOF_INT-1)) > 0) + LZOCHK_ASSERT((1u << (8*LZO_SIZEOF_INT-1)) > 0) #if defined(LZOCHK_CFG_PEDANTIC) - LZOCHK_ASSERT((1l << (8*SIZEOF_LONG-1)) < 0) + LZOCHK_ASSERT((1l << (8*LZO_SIZEOF_LONG-1)) < 0) #endif - LZOCHK_ASSERT((1ul << (8*SIZEOF_LONG-1)) > 0) + LZOCHK_ASSERT((1ul << (8*LZO_SIZEOF_LONG-1)) > 0) #if defined(lzo_int16e_t) LZOCHK_ASSERT(sizeof(lzo_int16e_t) == 2) LZOCHK_ASSERT(sizeof(lzo_int16e_t) == LZO_SIZEOF_LZO_INT16E_T) @@ -1852,13 +1849,13 @@ LZOLIB_EXTERN(int, lzo_spawnve) (int mode, const char* fn, const char* const * a LZOCHK_ASSERT((LZO_UINT64_C(0xffffffffffffffff) >> 63) == 1) LZOCHK_ASSERT((LZO_UINT64_C(0xffffffffffffffff) & ~0) == LZO_UINT64_C(0xffffffffffffffff)) LZOCHK_ASSERT((LZO_UINT64_C(0xffffffffffffffff) & ~0l) == LZO_UINT64_C(0xffffffffffffffff)) -#if (SIZEOF_INT == 4) +#if (LZO_SIZEOF_INT == 4) # if (LZO_CC_GNUC && (LZO_CC_GNUC < 0x020000ul)) # else LZOCHK_ASSERT((LZO_UINT64_C(0xffffffffffffffff) & (~0u+0u)) == 0xffffffffu) # endif #endif -#if (SIZEOF_LONG == 4) +#if (LZO_SIZEOF_LONG == 4) # if (LZO_CC_GNUC && (LZO_CC_GNUC < 0x020000ul)) # else LZOCHK_ASSERT((LZO_UINT64_C(0xffffffffffffffff) & (~0ul+0ul)) == 0xfffffffful) @@ -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 *)) @@ -1940,13 +1945,13 @@ LZOLIB_EXTERN(int, lzo_spawnve) (int mode, const char* fn, const char* const * a LZOCHK_ASSERT(sizeof(void (*)(void)) == 8) #endif #if (LZO_CC_NDPC) -#elif (SIZEOF_INT > 1) +#elif (LZO_SIZEOF_INT > 1) LZOCHK_ASSERT( LZO_STATIC_CAST(int, LZO_STATIC_CAST(unsigned char, LZO_STATIC_CAST(signed char, -1))) == 255) #endif #if defined(LZOCHK_CFG_PEDANTIC) #if (LZO_CC_KEILC) #elif (LZO_CC_NDPC) -#elif !(LZO_BROKEN_INTEGRAL_PROMOTION) && (SIZEOF_INT > 1) +#elif !(LZO_BROKEN_INTEGRAL_PROMOTION) && (LZO_SIZEOF_INT > 1) LZOCHK_ASSERT( ((LZO_STATIC_CAST(unsigned char, 128)) << LZO_STATIC_CAST(int, (8*sizeof(int)-8))) < 0) #endif #endif @@ -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 ea9f931..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-2014 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; @@ -696,7 +697,4 @@ void swd_findbest(lzo_swd_p s) #undef s_get_head3 -/* -vi:ts=4:et -*/ - +/* vim:set ts=4 sw=4 et: */ diff --git a/src/lzo_util.c b/src/lzo_util.c index 372bd12..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-2014 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 @@ -37,25 +37,27 @@ * keep this copyright string in the executable of your product. .*/ -static const char __lzo_copyright[] = +static const char lzo_copyright_[] = #if !defined(__LZO_IN_MINLZO) /* save space as some people want a really small decompressor */ LZO_VERSION_STRING; #else "\r\n\n" "LZO data compression library.\n" - "$Copyright: LZO Copyright (C) 1996-2014 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" "$Info: " LZO_INFO_STRING " $\n"; #endif +static const char lzo_version_string_[] = LZO_VERSION_STRING; +static const char lzo_version_date_[] = LZO_VERSION_DATE; LZO_PUBLIC(const lzo_bytep) lzo_copyright(void) { - return (const lzo_bytep) __lzo_copyright; + return (const lzo_bytep) lzo_copyright_; } LZO_PUBLIC(unsigned) @@ -67,31 +69,31 @@ lzo_version(void) LZO_PUBLIC(const char *) lzo_version_string(void) { - return LZO_VERSION_STRING; + return lzo_version_string_; } LZO_PUBLIC(const char *) lzo_version_date(void) { - return LZO_VERSION_DATE; + return lzo_version_date_; } LZO_PUBLIC(const lzo_charp) _lzo_version_string(void) { - return LZO_VERSION_STRING; + return lzo_version_string_; } LZO_PUBLIC(const lzo_charp) _lzo_version_date(void) { - return LZO_VERSION_DATE; + return lzo_version_date_; } /*********************************************************************** // 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/ ************************************************************************/ @@ -143,6 +145,4 @@ lzo_adler32(lzo_uint32_t adler, const lzo_bytep buf, lzo_uint len) #undef LZO_DO16 -/* -vi:ts=4:et -*/ +/* vim:set ts=4 sw=4 et: */ diff --git a/src/stats1a.h b/src/stats1a.h index 5c2af38..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-2014 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 @@ -120,6 +120,5 @@ extern lzo1a_stats_t *lzo1a_stats; #endif /* already included */ -/* -vi:ts=4:et -*/ + +/* vim:set ts=4 sw=4 et: */ diff --git a/src/stats1b.h b/src/stats1b.h index 453e7ab..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-2014 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 @@ -125,6 +125,5 @@ extern lzo1b_stats_t * const lzo1b_stats; #endif /* already included */ -/* -vi:ts=4:et -*/ + +/* vim:set ts=4 sw=4 et: */ diff --git a/src/stats1c.h b/src/stats1c.h index 7f1f4cd..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-2014 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,6 +44,5 @@ #endif /* already included */ -/* -vi:ts=4:et -*/ + +/* vim:set ts=4 sw=4 et: */ |