Skip to content

Commit

Permalink
Merge pull request #1024 from a1346054/dev
Browse files Browse the repository at this point in the history
Minor cleanup
  • Loading branch information
Cyan4973 committed Aug 22, 2021
2 parents e78eeec + 3e99d07 commit 1600ce5
Show file tree
Hide file tree
Showing 11 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ jobs:
# - LZ4 Frame
# - LZ4 versions
# - Custom LZ4_DISTANCE_MAX
#
#
lz4-benchmark:
name: Benchmark
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions doc/lz4_Frame_format.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 doesnt 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
Expand Down Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions examples/blockStreaming_lineByLine.md
Original file line number Diff line number Diff line change
@@ -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 :

Expand Down Expand Up @@ -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.
4 changes: 2 additions & 2 deletions examples/frameCompress.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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; }

Expand Down
2 changes: 1 addition & 1 deletion lib/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
Expand Down
2 changes: 1 addition & 1 deletion tests/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
```
Expand Down
2 changes: 1 addition & 1 deletion tests/test-lz4-list.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /usr/bin/env python3
#!/usr/bin/env python3
import subprocess
import time
import glob
Expand Down
2 changes: 1 addition & 1 deletion tests/test-lz4-speed.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /usr/bin/env python3
#!/usr/bin/env python3

#
# Copyright (c) 2016-2020, Przemyslaw Skibinski, Yann Collet, Facebook, Inc.
Expand Down
4 changes: 2 additions & 2 deletions tests/test_custom_block_sizes.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#/usr/bin/env sh
#!/usr/bin/env sh
set -e

LZ4=../lz4
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tests/test_install.sh
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#/usr/bin/env sh
#!/usr/bin/env sh
set -e


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

Expand Down

0 comments on commit 1600ce5

Please sign in to comment.