diff options
author | Yann Collet <cyan@fb.com> | 2016-09-03 02:32:06 (GMT) |
---|---|---|
committer | Yann Collet <cyan@fb.com> | 2016-09-03 02:32:06 (GMT) |
commit | 64f556e610b68e6781e05d2d6470ebf8b8dff45c (patch) | |
tree | f541f4fbc7c2d999b63527324613f77f3d3d42bb /lib | |
parent | 5871585b6a28c6582d1626b8d07bb1a53a4cbd9d (diff) | |
download | lz4-64f556e610b68e6781e05d2d6470ebf8b8dff45c.zip lz4-64f556e610b68e6781e05d2d6470ebf8b8dff45c.tar.gz lz4-64f556e610b68e6781e05d2d6470ebf8b8dff45c.tar.bz2 |
lz4cli version number from lz4.h
Diffstat (limited to 'lib')
-rw-r--r-- | lib/lz4.h | 8 | ||||
-rw-r--r-- | lib/lz4hc.c | 11 |
2 files changed, 13 insertions, 6 deletions
@@ -58,10 +58,10 @@ extern "C" { #define LZ4_VERSION_NUMBER (LZ4_VERSION_MAJOR *100*100 + LZ4_VERSION_MINOR *100 + LZ4_VERSION_RELEASE) int LZ4_versionNumber (void); -#define LZ4_STR(str) #str -#define LZ4_XSTR(str) LZ4_STR(str) -#define LZ4_VERSION_STRING LZ4_XSTR(LZ4_VERSION_MAJOR) "." \ - LZ4_XSTR(LZ4_VERSION_MINOR) "." LZ4_XSTR(LZ4_VERSION_RELEASE) +#define LZ4_LIB_VERSION LZ4_VERSION_MAJOR.LZ4_VERSION_MINOR.LZ4_VERSION_RELEASE +#define LZ4_QUOTE(str) #str +#define LZ4_EXPAND_AND_QUOTE(str) LZ4_QUOTE(str) +#define LZ4_VERSION_STRING LZ4_EXPAND_AND_QUOTE(LZ4_LIB_VERSION) const char* LZ4_versionString (void); diff --git a/lib/lz4hc.c b/lib/lz4hc.c index c6f67cb..68afa98 100644 --- a/lib/lz4hc.c +++ b/lib/lz4hc.c @@ -313,8 +313,15 @@ FORCE_INLINE int LZ4HC_encodeSequence ( /* Encode MatchLength */ length = (int)(matchLength-MINMATCH); if ((limitedOutputBuffer) && (*op + (length>>8) + (1 + LASTLITERALS) > oend)) return 1; /* Check output limit */ - if (length>=(int)ML_MASK) { *token+=ML_MASK; length-=ML_MASK; for(; length > 509 ; length-=510) { *(*op)++ = 255; *(*op)++ = 255; } if (length > 254) { length-=255; *(*op)++ = 255; } *(*op)++ = (BYTE)length; } - else *token += (BYTE)(length); + if (length>=(int)ML_MASK) { + *token += ML_MASK; + length -= ML_MASK; + for(; length > 509 ; length-=510) { *(*op)++ = 255; *(*op)++ = 255; } + if (length > 254) { length-=255; *(*op)++ = 255; } + *(*op)++ = (BYTE)length; + } else { + *token += (BYTE)(length); + } /* Prepare next loop */ *ip += matchLength; |