From 06dd74114ad96b7ddf83c3516ef2806ea518487f Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Mon, 18 Jul 2016 04:06:43 +0200 Subject: [PATCH] minor : long tests display progression status --- programs/playTests.sh | 2 +- programs/zstdcli.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/playTests.sh b/programs/playTests.sh index 8afd9cb5..b19c2bc5 100755 --- a/programs/playTests.sh +++ b/programs/playTests.sh @@ -16,7 +16,7 @@ roundTripTest() { rm -f tmp1 tmp2 $ECHO "roundTripTest: ./datagen $1 $p | $ZSTD -v$c | $ZSTD -d" ./datagen $1 $p | $MD5SUM > tmp1 - ./datagen $1 $p | $ZSTD -vq$c | $ZSTD -d | $MD5SUM > tmp2 + ./datagen $1 $p | $ZSTD -v$c | $ZSTD -d | $MD5SUM > tmp2 diff -q tmp1 tmp2 } diff --git a/programs/zstdcli.c b/programs/zstdcli.c index 4fa80269..d4f4c21e 100644 --- a/programs/zstdcli.c +++ b/programs/zstdcli.c @@ -441,7 +441,7 @@ int main(int argCount, const char** argv) fileNamesTable = UTIL_createFileList(filenameTable, filenameIdx, &fileNamesBuf, &fileNamesNb); if (fileNamesTable) { unsigned i; - for (i=0; i use stdin and stdout */ filenameIdx += !filenameIdx; /*< default input is stdin */ - if (!strcmp(filenameTable[0], stdinmark) && !outFileName ) outFileName = stdoutmark; /*< when input is stdin, default output is stdout */ + if (!strcmp(filenameTable[0], stdinmark) && !outFileName) outFileName = stdoutmark; /*< when input is stdin, default output is stdout */ /* Check if input/output defined as console; trigger an error in this case */ if (!strcmp(filenameTable[0], stdinmark) && IS_CONSOLE(stdin) ) CLEAN_RETURN(badusage(programName)); @@ -489,7 +489,7 @@ int main(int argCount, const char** argv) /* No warning message in pipe mode (stdin + stdout) or multiple mode */ if (!strcmp(filenameTable[0], stdinmark) && outFileName && !strcmp(outFileName,stdoutmark) && (displayLevel==2)) displayLevel=1; - if ((filenameIdx>1) && (displayLevel==2)) displayLevel=1; + if ((filenameIdx>1) & (displayLevel==2)) displayLevel=1; /* IO Stream/File */ FIO_setNotificationLevel(displayLevel);