darlinghq/lzfse
1
0
Fork 0
mirror of https://github.com/darlinghq/lzfse.git synced 2024-11-23 04:09:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

merged nemequ changes; fixed end of stream reservation size in LZVN partial encoder; fixed Xcode project with updated README.md file

Browse Source
This commit is contained in:
Eric Bainville 2016-06-20 15:43:07 -07:00
parent e80f2c620d
commit 45912281e3
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lzfse.xcodeproj/project.pbxproj
View File

@ -66,6 +66,7 @@
0B1AF7CB1B8CFF58005BF60D /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; };
0B1AF7D21B8D0EBF005BF60D /* lzfse */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = lzfse; sourceTree = BUILT_PRODUCTS_DIR; };
0B1AF7E11B8D0F59005BF60D /* lzfse_main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lzfse_main.c; path = src/lzfse_main.c; sourceTree = "<group>"; };
0B494D921D18A060002BE277 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
0B57822C1B8BC12F002F950F /* liblzfse.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = liblzfse.a; sourceTree = BUILT_PRODUCTS_DIR; };
0B5782321B8BC151002F950F /* lzfse_decode_base.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lzfse_decode_base.c; path = src/lzfse_decode_base.c; sourceTree = "<group>"; };
0B5782341B8BC151002F950F /* lzfse_decode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lzfse_decode.c; path = src/lzfse_decode.c; sourceTree = "<group>"; };
@ -77,7 +78,6 @@
0B57823A1B8BC151002F950F /* lzfse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lzfse.h; path = src/lzfse.h; sourceTree = "<group>"; };
0BA652BD1D0733B20019BFE3 /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
0BB39B9E1BE13F12004F4733 /* lzfse_fse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lzfse_fse.c; path = src/lzfse_fse.c; sourceTree = "<group>"; };
0BC009281C4819CC0068DBA1 /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README; sourceTree = "<group>"; };
6301162F1BFE759100D6CAA3 /* lzfse_tunables.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = lzfse_tunables.h; path = src/lzfse_tunables.h; sourceTree = "<group>"; };
/* End PBXFileReference section */
@ -141,8 +141,8 @@
0B7CB3811B8BBEA500730478 = {
isa = PBXGroup;
children = (
0B494D921D18A060002BE277 /* README.md */,
0BA652BD1D0733B20019BFE3 /* LICENSE */,
0BC009281C4819CC0068DBA1 /* README */,
0B1AF7CB1B8CFF58005BF60D /* Makefile */,
0B1AF7CD1B8D0E88005BF60D /* LZFSE command */,
0B5782311B8BC13D002F950F /* LZFSE lib */,

16
src/lzvn_encode_base.c
View File

@ -554,22 +554,24 @@ static size_t lzvn_encode_partial(void *__restrict dst, size_t dst_size,
state.src_current = 0;
state.dst = dst;
state.dst_begin = dst;
state.dst_end = dst + dst_size - 1; // allow 1 byte for end-of-stream
state.dst_end = dst + dst_size - 8; // reserve 8 bytes for end-of-stream
state.table = work;
// Do not encode if the input buffer is too small. We'll emit a literal instead.
if (src_size >= LZVN_ENCODE_MIN_SRC_SIZE) {
state.src_current_end = (lzvn_offset)src_size - LZVN_ENCODE_MIN_MARGIN;
lzvn_init_table(&state);
lzvn_encode(&state);
} else {
state.src_current_end = 0;
}
// No need to test the return value: src_literal will not be updated on failure,
// and we will fail later.
lzvn_emit_literal(&state, state.src_end - state.src_literal);
state.dst_end =
dst + dst_size; // restore final byte, so end-of-stream always succeeds
// Restore original size, so end-of-stream always succeeds, and emit it
state.dst_end = dst + dst_size;
lzvn_emit_end_of_stream(&state);
*src_used = state.src_literal;