fixed xzstd

--format=xz was missing a break, making the execution continue into lz4 error message

diff --git a/programs/Makefile b/programs/Makefile
index 2ab29e1ef5c1800c32456493055e435aa3ebafe6..0c50f50bd0950b3fbf074aa93bc439588a2636ab 100644 (file)
--- a/programs/Makefile
+++ b/programs/Makefile
@@ -140,15 +140,13 @@ $(ZSTDDECOMP_O): CFLAGS += $(ALIGN_LOOP)
 
 zstd : CPPFLAGS += $(ZLIBCPP) $(THREAD_CPP)
 zstd : LDFLAGS += $(ZLIBLD) $(THREAD_LD)
-zstd : LZMA_MSG := $(NO_LZMA_MSG)
+zstd zstd-nogz zstd4 : LZMA_MSG := ""
+zstd zstd-nogz xzstd : LZ4_MSG := ""
 zstd-nogz : ZLIB_MSG := $(NO_ZLIB_MSG)
-zstd-nogz : LZMA_MSG := $(NO_LZMA_MSG)
 xzstd : CPPFLAGS += $(ZLIBCPP) $(LZMACPP)
 xzstd : LDFLAGS += $(ZLIBLD) $(LZMALD)
-xzstd : LZ4_MSG := $(NO_LZ4_MSG)
 zstd4 : CPPFLAGS += $(ZLIBCPP) $(LZ4CPP)
 zstd4 : LDFLAGS += $(ZLIBLD) $(LZ4LD)
-zstd4 : LZMA_MSG := $(NO_LZMA_MSG)
 zstd zstd-nogz xzstd zstd4 : CPPFLAGS += -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT)
 zstd zstd-nogz xzstd zstd4 : $(ZSTDLIB_FILES) zstdcli.o fileio.o bench.o datagen.o dibio.o
        @echo "$(THREAD_MSG)"

diff --git a/programs/fileio.c b/programs/fileio.c
index 944b11ab41d9385b73cf9cf445a48758bc2ce569..e188936b21f552ea3ffa0af908d05721d8933857 100644 (file)
--- a/programs/fileio.c
+++ b/programs/fileio.c
@@ -617,6 +617,7 @@ static int FIO_compressFilename_internal(cRess_t ress,
     switch (g_compressionType) {
         case FIO_zstdCompression:
             break;
+
         case FIO_gzipCompression:
 #ifdef ZSTD_GZCOMPRESS
             compressedfilesize = FIO_compressGzFrame(&ress, srcFileName, fileSize, compressionLevel, &readsize);
@@ -625,6 +626,7 @@ static int FIO_compressFilename_internal(cRess_t ress,
             EXM_THROW(20, "zstd: %s: file cannot be compressed as gzip (zstd compiled without ZSTD_GZCOMPRESS) -- ignored \n", srcFileName);
 #endif
             goto finish;
+
         case FIO_xzCompression:
         case FIO_lzmaCompression:
 #ifdef ZSTD_LZMACOMPRESS
@@ -633,6 +635,8 @@ static int FIO_compressFilename_internal(cRess_t ress,
             (void)compressionLevel;
             EXM_THROW(20, "zstd: %s: file cannot be compressed as xz/lzma (zstd compiled without ZSTD_LZMACOMPRESS) -- ignored \n", srcFileName);
 #endif
+            goto finish;
+
         case FIO_lz4Compression:
 #ifdef ZSTD_LZ4COMPRESS
             compressedfilesize = FIO_compressLz4Frame(&ress, srcFileName, fileSize, compressionLevel, &readsize);

diff --git a/programs/zstdcli.c b/programs/zstdcli.c
index f6ce2e1a6edf6dbbe84c47b31fee63329fd3db6f..32fef99930e91f87e29bec68add1c9bb5f5148ad 100644 (file)
--- a/programs/zstdcli.c
+++ b/programs/zstdcli.c
@@ -514,11 +514,11 @@ int main(int argCount, const char* argv[])
                         /* Quiet mode */
                     case 'q': g_displayLevel--; argument++; break;
 
-                        /* keep source file (default); for gzip/xz compatibility */
+                        /* keep source file (default) */
                     case 'k': FIO_setRemoveSrcFile(0); argument++; break;
 
                         /* Checksum */
-                    case 'C': argument++; FIO_setChecksumFlag(2); break;
+                    case 'C': FIO_setChecksumFlag(2); argument++; break;
 
                         /* test compressed file */
                     case 't': operation=zom_test; argument++; break;