diff options
| -rw-r--r-- | .github/workflows/ci.yml | 2 | ||||
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | doc/lz4_Frame_format.md | 8 | ||||
| -rw-r--r-- | examples/blockStreaming_lineByLine.md | 4 | ||||
| -rw-r--r-- | examples/frameCompress.c | 4 | ||||
| -rw-r--r-- | lib/README.md | 2 | ||||
| -rw-r--r-- | tests/README.md | 2 | ||||
| -rw-r--r-- | tests/test-lz4-list.py | 2 | ||||
| -rw-r--r-- | tests/test-lz4-speed.py | 2 | ||||
| -rwxr-xr-x | tests/test_custom_block_sizes.sh | 4 | ||||
| -rwxr-xr-x | tests/test_install.sh | 4 |
11 files changed, 18 insertions, 18 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 84871c2..74e203d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -155,7 +155,7 @@ jobs: # - LZ4 Frame # - LZ4 versions # - Custom LZ4_DISTANCE_MAX -# +# lz4-benchmark: name: Benchmark runs-on: ubuntu-latest diff --git a/.travis.yml b/.travis.yml index 8eae1a2..4656cbb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -231,7 +231,7 @@ matrix: - name: Compile OSS-Fuzz targets script: - ./ossfuzz/travisoss.sh - + # Unicode lint # See https://github.com/lz4/lz4/issues/1018 - name: Run Unicode lint diff --git a/doc/lz4_Frame_format.md b/doc/lz4_Frame_format.md index de29189..7b6c2ef 100644 --- a/doc/lz4_Frame_format.md +++ b/doc/lz4_Frame_format.md @@ -6,8 +6,8 @@ LZ4 Frame Format Description Copyright (c) 2013-2020 Yann Collet Permission is granted to copy and distribute this document -for any purpose and without charge, -including translations into other languages +for any purpose and without charge, +including translations into other languages and incorporation into compilations, provided that the copyright notice and this notice are preserved, and that any substantive changes or deletions from the original @@ -47,7 +47,7 @@ at the level of bits and other primitive data representations. Unless otherwise indicated below, a compliant compressor must produce data sets that conform to the specifications presented here. -It doesn’t need to support all options though. +It doesn't need to support all options though. A compliant decompressor must be able to decompress at least one working set of parameters @@ -385,7 +385,7 @@ __EndMark__ End of legacy frame is implicit only. It must be followed by a standard EOF (End Of File) signal, -wether it is a file or a stream. +whether it is a file or a stream. Alternatively, if the frame is followed by a valid Frame Magic Number, it is considered completed. diff --git a/examples/blockStreaming_lineByLine.md b/examples/blockStreaming_lineByLine.md index 4735f92..90342f6 100644 --- a/examples/blockStreaming_lineByLine.md +++ b/examples/blockStreaming_lineByLine.md @@ -1,7 +1,7 @@ # LZ4 Streaming API Example : Line by Line Text Compression by *Takayuki Matsuoka* -`blockStreaming_lineByLine.c` is LZ4 Straming API example which implements line by line incremental (de)compression. +`blockStreaming_lineByLine.c` is LZ4 Streaming API example which implements line by line incremental (de)compression. Please note the following restrictions : @@ -117,6 +117,6 @@ Decompression will do reverse order. - Read compressed line from the file to buffer. - Decompress it to the ringbuffer. - Output decompressed plain text line to the file. - - Forward ringbuffer offset. If offset exceedes end of the ringbuffer, reset it. + - Forward ringbuffer offset. If offset exceeds end of the ringbuffer, reset it. Continue these procedure to the end of the compressed file. diff --git a/examples/frameCompress.c b/examples/frameCompress.c index aac4a3b..4a88b50 100644 --- a/examples/frameCompress.c +++ b/examples/frameCompress.c @@ -125,7 +125,7 @@ compress_file(FILE* f_in, FILE* f_out) assert(f_in != NULL); assert(f_out != NULL); - /* ressource allocation */ + /* resource allocation */ LZ4F_compressionContext_t ctx; size_t const ctxCreation = LZ4F_createCompressionContext(&ctx, LZ4F_VERSION); void* const src = malloc(IN_CHUNK_SIZE); @@ -286,7 +286,7 @@ static int decompress_file(FILE* f_in, FILE* f_out) { assert(f_in != NULL); assert(f_out != NULL); - /* Ressource allocation */ + /* Resource allocation */ void* const src = malloc(IN_CHUNK_SIZE); if (!src) { perror("decompress_file(src)"); return 1; } diff --git a/lib/README.md b/lib/README.md index e2af868..884c797 100644 --- a/lib/README.md +++ b/lib/README.md @@ -101,7 +101,7 @@ All `*.h` files present in `/lib` remain necessary to compile `lz4_all.c`. DLL can be created using MinGW+MSYS with the `make liblz4` command. This command creates `dll\liblz4.dll` and the import library `dll\liblz4.lib`. -To override the `dlltool` command when cross-compiling on Linux, just set the `DLLTOOL` variable. Example of cross compilation on Linux with mingw-w64 64 bits: +To override the `dlltool` command when cross-compiling on Linux, just set the `DLLTOOL` variable. Example of cross compilation on Linux with mingw-w64 64 bits: ``` make BUILD_STATIC=no CC=x86_64-w64-mingw32-gcc DLLTOOL=x86_64-w64-mingw32-dlltool OS=Windows_NT ``` diff --git a/tests/README.md b/tests/README.md index 75b7b9f..37d7d72 100644 --- a/tests/README.md +++ b/tests/README.md @@ -37,7 +37,7 @@ Additional remarks: The example usage with two test files, one e-mail address, and with an additional message: ``` ./test-lz4-speed.py "silesia.tar calgary.tar" "email@gmail.com" --message "tested on my laptop" --sleepTime 60 -``` +``` To run the script in background please use: ``` diff --git a/tests/test-lz4-list.py b/tests/test-lz4-list.py index ce89757..b8d844a 100644 --- a/tests/test-lz4-list.py +++ b/tests/test-lz4-list.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python3 +#!/usr/bin/env python3 import subprocess import time import glob diff --git a/tests/test-lz4-speed.py b/tests/test-lz4-speed.py index 4a17d93..658939c 100644 --- a/tests/test-lz4-speed.py +++ b/tests/test-lz4-speed.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python3 +#!/usr/bin/env python3 # # Copyright (c) 2016-2020, Przemyslaw Skibinski, Yann Collet, Facebook, Inc. diff --git a/tests/test_custom_block_sizes.sh b/tests/test_custom_block_sizes.sh index aba6733..2f6591f 100755 --- a/tests/test_custom_block_sizes.sh +++ b/tests/test_custom_block_sizes.sh @@ -1,4 +1,4 @@ -#/usr/bin/env sh +#!/usr/bin/env sh set -e LZ4=../lz4 @@ -62,7 +62,7 @@ do done rm $TMPFILE.lz4 $TMPFILE1 $TMPFILE1.lz4 $TMPFILE2 $TMPFILE2.lz4 -if [ "$failures" == "" ] +if [ "$failures" = "" ] then echo ---- All tests passed exit 0 diff --git a/tests/test_install.sh b/tests/test_install.sh index 122bac5..ad0d4eb 100755 --- a/tests/test_install.sh +++ b/tests/test_install.sh @@ -1,4 +1,4 @@ -#/usr/bin/env sh +#!/usr/bin/env sh set -e @@ -6,7 +6,7 @@ make="make -C $lz4_root" unamestr=$(uname) if [ "$unamestr" = 'Linux' ]; then make="make -C $lz4_root" -elif [ "$unamestr" = 'FreeBSD' -o "$unamestr" = 'OpenBSD' ]; then +elif [ "$unamestr" = 'FreeBSD' ] || [ "$unamestr" = 'OpenBSD' ]; then make="gmake -C $lz4_root" fi |