openkylin
/
lzo2
mirror of https://gitee.com/openkylin/lzo2.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

format patches

This commit is contained in:
openKylinBot 2022-05-14 01:47:09 +08:00
parent 21641b6b3a
commit b5dba220b0
1 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
debian/patches/0001-Conditionally-replace-reinvention-of-memcpy-with-cal.patch vendored
View File

@ -21,9 +21,11 @@ Bug-Debian: https://bugs.debian.org/757037
src/lzo_func.h | 71 +++++++++++++++++++++++++++++++++++++++++++--------
3 files changed, 125 insertions(+), 24 deletions(-)
diff --git a/minilzo/minilzo.c b/minilzo/minilzo.c
index 8fd8664..2a86444 100644
--- a/minilzo/minilzo.c
+++ b/minilzo/minilzo.c
@@ -3661,6 +3661,49 @@
@@ -3661,6 +3661,49 @@ lzo_unused_funcs_impl(void, lzo_bitops_unused_funcs)(void)
#endif
}
@ -73,7 +75,7 @@ Bug-Debian: https://bugs.debian.org/757037
#if defined(__lzo_alignof) && !(LZO_CFG_NO_UNALIGNED)
#if !defined(lzo_memops_tcheck__) && 0
#define lzo_memops_tcheck__(t,a,b) ((void)0, sizeof(t) == (a) && __lzo_alignof(t) == (b))
@@ -3830,6 +3873,8 @@
@@ -3830,6 +3873,8 @@ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(*(lzo_memops_TU8p)0)==8)
if ((void)0, n__n > 0) do { *d__n++ = *s__n++; } while (--n__n > 0); \
LZO_BLOCK_END
@ -82,7 +84,7 @@ Bug-Debian: https://bugs.debian.org/757037
__lzo_static_forceinline lzo_uint16_t lzo_memops_get_le16(const lzo_voidp ss)
{
lzo_uint16_t v;
@@ -3846,7 +3891,7 @@
@@ -3846,7 +3891,7 @@ __lzo_static_forceinline lzo_uint16_t lzo_memops_get_le16(const lzo_voidp ss)
#endif
return v;
}
@ -91,7 +93,7 @@ Bug-Debian: https://bugs.debian.org/757037
#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)
@@ -3868,13 +3913,13 @@
@@ -3868,13 +3913,13 @@ __lzo_static_forceinline lzo_uint32_t lzo_memops_get_le32(const lzo_voidp ss)
#endif
return v;
}
@ -107,7 +109,7 @@ Bug-Debian: https://bugs.debian.org/757037
#define LZO_MEMOPS_GET_LE64(ss) (* (const lzo_memops_TU8p) (const lzo_memops_TU0p) (ss))
#endif
@@ -3884,7 +3929,7 @@
@@ -3884,7 +3929,7 @@ __lzo_static_forceinline lzo_uint16_t lzo_memops_get_ne16(const lzo_voidp ss)
LZO_MEMOPS_COPY2(&v, ss);
return v;
}
@ -116,7 +118,7 @@ Bug-Debian: https://bugs.debian.org/757037
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
@@ -3897,16 +3942,25 @@
@@ -3897,16 +3942,25 @@ __lzo_static_forceinline lzo_uint32_t lzo_memops_get_ne32(const lzo_voidp ss)
LZO_MEMOPS_COPY4(&v, ss);
return v;
}
@ -144,7 +146,7 @@ Bug-Debian: https://bugs.debian.org/757037
#endif
__lzo_static_forceinline void lzo_memops_put_le16(lzo_voidp dd, lzo_uint16_t vv)
@@ -3923,7 +3977,7 @@
@@ -3923,7 +3977,7 @@ __lzo_static_forceinline void lzo_memops_put_le16(lzo_voidp dd, lzo_uint16_t vv)
d[1] = LZO_BYTE((vv >> 8) & 0xff);
#endif
}
@ -153,7 +155,7 @@ Bug-Debian: https://bugs.debian.org/757037
#define LZO_MEMOPS_PUT_LE16(dd,vv) (* (lzo_memops_TU2p) (lzo_memops_TU0p) (dd) = (vv))
#else
#define LZO_MEMOPS_PUT_LE16(dd,vv) lzo_memops_put_le16(dd,vv)
@@ -3945,7 +3999,7 @@
@@ -3945,7 +3999,7 @@ __lzo_static_forceinline void lzo_memops_put_le32(lzo_voidp dd, lzo_uint32_t vv)
d[3] = LZO_BYTE((vv >> 24) & 0xff);
#endif
}
@ -162,7 +164,7 @@ Bug-Debian: https://bugs.debian.org/757037
#define LZO_MEMOPS_PUT_LE32(dd,vv) (* (lzo_memops_TU4p) (lzo_memops_TU0p) (dd) = (vv))
#else
#define LZO_MEMOPS_PUT_LE32(dd,vv) lzo_memops_put_le32(dd,vv)
@@ -3955,7 +4009,7 @@
@@ -3955,7 +4009,7 @@ __lzo_static_forceinline void lzo_memops_put_ne16(lzo_voidp dd, lzo_uint16_t vv)
{
LZO_MEMOPS_COPY2(dd, &vv);
}
@ -171,7 +173,7 @@ Bug-Debian: https://bugs.debian.org/757037
#define LZO_MEMOPS_PUT_NE16(dd,vv) (* (lzo_memops_TU2p) (lzo_memops_TU0p) (dd) = (vv))
#else
#define LZO_MEMOPS_PUT_NE16(dd,vv) lzo_memops_put_ne16(dd,vv)
@@ -3965,7 +4019,7 @@
@@ -3965,7 +4019,7 @@ __lzo_static_forceinline void lzo_memops_put_ne32(lzo_voidp dd, lzo_uint32_t vv)
{
LZO_MEMOPS_COPY4(dd, &vv);
}
@ -180,7 +182,7 @@ Bug-Debian: https://bugs.debian.org/757037
#define LZO_MEMOPS_PUT_NE32(dd,vv) (* (lzo_memops_TU4p) (lzo_memops_TU0p) (dd) = (vv))
#else
#define LZO_MEMOPS_PUT_NE32(dd,vv) lzo_memops_put_ne32(dd,vv)
@@ -4051,11 +4105,9 @@
@@ -4051,11 +4105,9 @@ lzo_unused_funcs_impl(void, lzo_memops_unused_funcs)(void)
#ifndef UA_GET_NE32
#define UA_GET_NE32 LZO_MEMOPS_GET_NE32
#endif
@ -192,9 +194,11 @@ Bug-Debian: https://bugs.debian.org/757037
#ifndef UA_PUT_LE16
#define UA_PUT_LE16 LZO_MEMOPS_PUT_LE16
#endif
diff --git a/src/lzo_conf.h b/src/lzo_conf.h
index aa9a2b6..ed381fd 100644
--- a/src/lzo_conf.h
+++ b/src/lzo_conf.h
@@ -362,11 +362,9 @@
@@ -362,11 +362,9 @@ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_uint64_t) == 8)
#ifndef UA_GET_NE32
#define UA_GET_NE32 LZO_MEMOPS_GET_NE32
#endif
@ -206,9 +210,11 @@ Bug-Debian: https://bugs.debian.org/757037
#ifndef UA_PUT_LE16
#define UA_PUT_LE16 LZO_MEMOPS_PUT_LE16
#endif
diff --git a/src/lzo_func.h b/src/lzo_func.h
index f3ac8e3..835e7b9 100644
--- a/src/lzo_func.h
+++ b/src/lzo_func.h
@@ -162,6 +162,46 @@
@@ -162,6 +162,46 @@ lzo_unused_funcs_impl(void, lzo_bitops_unused_funcs)(void)
// memops
************************************************************************/
@ -255,7 +261,7 @@ Bug-Debian: https://bugs.debian.org/757037
#if defined(__lzo_alignof) && !(LZO_CFG_NO_UNALIGNED)
/* CBUG: disabled because of gcc bug 64516 */
#if !defined(lzo_memops_tcheck__) && 0
@@ -332,6 +372,8 @@
@@ -332,6 +372,8 @@ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(*(lzo_memops_TU8p)0)==8)
if ((void)0, n__n > 0) do { *d__n++ = *s__n++; } while (--n__n > 0); \
LZO_BLOCK_END
@ -264,7 +270,7 @@ Bug-Debian: https://bugs.debian.org/757037
__lzo_static_forceinline lzo_uint16_t lzo_memops_get_le16(const lzo_voidp ss)
{
lzo_uint16_t v;
@@ -348,7 +390,7 @@
@@ -348,7 +390,7 @@ __lzo_static_forceinline lzo_uint16_t lzo_memops_get_le16(const lzo_voidp ss)
#endif
return v;
}
@ -273,7 +279,7 @@ Bug-Debian: https://bugs.debian.org/757037
#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)
@@ -370,13 +412,13 @@
@@ -370,13 +412,13 @@ __lzo_static_forceinline lzo_uint32_t lzo_memops_get_le32(const lzo_voidp ss)
#endif
return v;
}
@ -289,7 +295,7 @@ Bug-Debian: https://bugs.debian.org/757037
#define LZO_MEMOPS_GET_LE64(ss) (* (const lzo_memops_TU8p) (const lzo_memops_TU0p) (ss))
#endif
@@ -386,7 +428,7 @@
@@ -386,7 +428,7 @@ __lzo_static_forceinline lzo_uint16_t lzo_memops_get_ne16(const lzo_voidp ss)
LZO_MEMOPS_COPY2(&v, ss);
return v;
}
@ -298,7 +304,7 @@ Bug-Debian: https://bugs.debian.org/757037
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
@@ -399,16 +441,25 @@
@@ -399,16 +441,25 @@ __lzo_static_forceinline lzo_uint32_t lzo_memops_get_ne32(const lzo_voidp ss)
LZO_MEMOPS_COPY4(&v, ss);
return v;
}
@ -326,7 +332,7 @@ Bug-Debian: https://bugs.debian.org/757037
#endif
__lzo_static_forceinline void lzo_memops_put_le16(lzo_voidp dd, lzo_uint16_t vv)
@@ -425,7 +476,7 @@
@@ -425,7 +476,7 @@ __lzo_static_forceinline void lzo_memops_put_le16(lzo_voidp dd, lzo_uint16_t vv)
d[1] = LZO_BYTE((vv >> 8) & 0xff);
#endif
}
@ -335,7 +341,7 @@ Bug-Debian: https://bugs.debian.org/757037
#define LZO_MEMOPS_PUT_LE16(dd,vv) (* (lzo_memops_TU2p) (lzo_memops_TU0p) (dd) = (vv))
#else
#define LZO_MEMOPS_PUT_LE16(dd,vv) lzo_memops_put_le16(dd,vv)
@@ -447,7 +498,7 @@
@@ -447,7 +498,7 @@ __lzo_static_forceinline void lzo_memops_put_le32(lzo_voidp dd, lzo_uint32_t vv)
d[3] = LZO_BYTE((vv >> 24) & 0xff);
#endif
}
@ -344,7 +350,7 @@ Bug-Debian: https://bugs.debian.org/757037
#define LZO_MEMOPS_PUT_LE32(dd,vv) (* (lzo_memops_TU4p) (lzo_memops_TU0p) (dd) = (vv))
#else
#define LZO_MEMOPS_PUT_LE32(dd,vv) lzo_memops_put_le32(dd,vv)
@@ -457,7 +508,7 @@
@@ -457,7 +508,7 @@ __lzo_static_forceinline void lzo_memops_put_ne16(lzo_voidp dd, lzo_uint16_t vv)
{
LZO_MEMOPS_COPY2(dd, &vv);
}
@ -353,7 +359,7 @@ Bug-Debian: https://bugs.debian.org/757037
#define LZO_MEMOPS_PUT_NE16(dd,vv) (* (lzo_memops_TU2p) (lzo_memops_TU0p) (dd) = (vv))
#else
#define LZO_MEMOPS_PUT_NE16(dd,vv) lzo_memops_put_ne16(dd,vv)
@@ -467,7 +518,7 @@
@@ -467,7 +518,7 @@ __lzo_static_forceinline void lzo_memops_put_ne32(lzo_voidp dd, lzo_uint32_t vv)
{
LZO_MEMOPS_COPY4(dd, &vv);
}