diff options
| author | Yann Collet <yann.collet.73@gmail.com> | 2015-04-16 06:16:48 (GMT) |
|---|---|---|
| committer | Yann Collet <yann.collet.73@gmail.com> | 2015-04-16 06:16:48 (GMT) |
| commit | 13c6e16333a63319ef0def9da6595a3bc7d2915d (patch) | |
| tree | 7aec220bd97a7fb821d929b294d16c044c56ccec /programs | |
| parent | a430b859cf552aa43215fe082e15a95c8bda5d6f (diff) | |
| download | lz4-13c6e16333a63319ef0def9da6595a3bc7d2915d.zip lz4-13c6e16333a63319ef0def9da6595a3bc7d2915d.tar.gz lz4-13c6e16333a63319ef0def9da6595a3bc7d2915d.tar.bz2 | |
Removed status notification in multiple-files mode
Diffstat (limited to 'programs')
| -rw-r--r-- | programs/Makefile | 6 | ||||
| -rw-r--r-- | programs/lz4cli.c | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/programs/Makefile b/programs/Makefile index fa6b04d..6eec96e 100644 --- a/programs/Makefile +++ b/programs/Makefile @@ -193,9 +193,9 @@ test-lz4-frame-concatenation: lz4 datagen test-lz4-multiple: lz4 datagen @echo ---- test multiple files ---- - @./datagen -s1 > tmp1 - @./datagen -s2 -g100K > tmp2 - @./datagen -s3 -g1M > tmp3 + @./datagen -s1 > tmp1 2> $(VOID) + @./datagen -s2 -g100K > tmp2 2> $(VOID) + @./datagen -s3 -g1M > tmp3 2> $(VOID) ./lz4 -f -m tmp* ls -ls tmp* rm tmp1 tmp2 tmp3 diff --git a/programs/lz4cli.c b/programs/lz4cli.c index 8d7d5ca..d77ef5b 100644 --- a/programs/lz4cli.c +++ b/programs/lz4cli.c @@ -102,7 +102,7 @@ ***************************************/ #define DISPLAY(...) fprintf(stderr, __VA_ARGS__) #define DISPLAYLEVEL(l, ...) if (displayLevel>=l) { DISPLAY(__VA_ARGS__); } -static unsigned displayLevel = 2; /* 0 : no display ; 1: errors ; 2 : + result + interaction + warnings ; 3 : + progression; 4 : + information */ +static unsigned displayLevel = 2; /* 0 : no display ; 1: errors only ; 2 : downgradable normal ; 3 : non-downgradable normal; 4 : + information */ /************************************** @@ -521,8 +521,9 @@ int main(int argc, char** argv) /* Check if output is defined as console; trigger an error in this case */ if (!strcmp(output_filename,stdoutmark) && IS_CONSOLE(stdout) && !forceStdout) badusage(); - /* No warning message in pure pipe mode (stdin + stdout) */ + /* Downgrade notification level in pure pipe mode (stdin + stdout) and multiple file mode */ if (!strcmp(input_filename, stdinmark) && !strcmp(output_filename,stdoutmark) && (displayLevel==2)) displayLevel=1; + if ((multiple_inputs) && (displayLevel==2)) displayLevel=1; /* IO Stream/File */ |