From 4eccc82875d6e5ca8a621fc80acd363a5efb9d3f Mon Sep 17 00:00:00 2001 From: "W. Felix Handte" Date: Fri, 25 Oct 2019 13:58:58 -0400 Subject: [PATCH] Minor Fixes --- programs/fileio.c | 1 - programs/fileio.h | 3 ++- tests/playTests.sh | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/fileio.c b/programs/fileio.c index c2c5618e5..828878c6a 100644 --- a/programs/fileio.c +++ b/programs/fileio.c @@ -2400,7 +2400,6 @@ FIO_determineDstName(const char* srcFileName, const char* outDirName) /* The short tar extensions tzst, tgz, txz and tlz4 files should have "tar" * extension on decompression. Also writes terminating null. */ strcpy(dstFileNameBuffer + dstFileNameEndPos, dstSuffix); - dstFileNameEndPos += dstSuffixLen; return dstFileNameBuffer; /* note : dstFileNameBuffer memory is not going to be free */ diff --git a/programs/fileio.h b/programs/fileio.h index 39eb544a1..af2c5d9d1 100644 --- a/programs/fileio.h +++ b/programs/fileio.h @@ -31,7 +31,8 @@ extern "C" { # define nulmark "/dev/null" #endif -/* We test whether the extension we found starts with 't', and if so, we append +/** + * We test whether the extension we found starts with 't', and if so, we append * ".tar" to the end of the output name. */ #define LZMA_EXTENSION ".lzma" diff --git a/tests/playTests.sh b/tests/playTests.sh index 9d9c8e3dc..c1da16507 100755 --- a/tests/playTests.sh +++ b/tests/playTests.sh @@ -865,14 +865,14 @@ if [ $GZIPMODE -eq 1 ]; then fi if [ $LZMAMODE -eq 1 ]; then - tar c tmp | xz > tmp.txz + tar c tmp | $ZSTD --format=xz > tmp.txz $ZSTD -d tmp.txz [ -e tmp.tar ] || die ".txz failed to decompress to .tar!" rm -f tmp.tar tmp.txz fi if [ $LZ4MODE -eq 1 ]; then - tar c tmp | lz4 > tmp.tlz4 + tar c tmp | $ZSTD --format=lz4 > tmp.tlz4 $ZSTD -d tmp.tlz4 [ -e tmp.tar ] || die ".tlz4 failed to decompress to .tar!" rm -f tmp.tar tmp.tlz4 -- 2.47.2