Minor tidying.

This commit is contained in:
Con Kolivas 2010-11-01 19:59:27 +11:00
parent 232b268367
commit ba1bf30d78
2 changed files with 5 additions and 5 deletions

6
main.c
View file

@ -72,7 +72,7 @@ static void write_magic(int fd_in, int fd_out)
memcpy(&magic[6], &control.st_size, 8);
/* save LZMA compression flags */
if (LZMA_COMPRESS(control.flags)) {
if (LZMA_COMPRESS) {
for (i = 0; i < 5; i++)
magic[i + 16] = (char)control.lzma_properties[i];
}
@ -719,7 +719,7 @@ int main(int argc, char *argv[])
if (VERBOSE && !INFO) {
print_err("The following options are in effect for this %s.\n",
DECOMPRESS ? "DECOMPRESSION" : "COMPRESSION");
if (LZMA_COMPRESS(control.flags))
if (LZMA_COMPRESS)
print_err("Threading is %s. Number of CPUs detected: %lu\n", control.threads > 1? "ENABLED" : "DISABLED",
control.threads);
print_err("Nice Value: %d\n", control.nice_val);
@ -743,7 +743,7 @@ int main(int argc, char *argv[])
/* show compression options */
if (!DECOMPRESS) {
print_err("Compression mode is: ");
if (LZMA_COMPRESS(control.flags))
if (LZMA_COMPRESS)
print_err("LZMA. LZO Test Compression Threshold: %.f\n",
(control.threshold < 1.05 ? 21 - control.threshold * 20 : 0));
else if (LZO_COMPRESS)

2
rzip.h
View file

@ -138,7 +138,7 @@ typedef uint32_t u32;
#define FLAG_VERBOSE (FLAG_VERBOSITY | FLAG_VERBOSITY_MAX)
#define FLAG_NOT_LZMA (FLAG_NO_COMPRESS | FLAG_LZO_COMPRESS | FLAG_BZIP2_COMPRESS | FLAG_ZLIB_COMPRESS | FLAG_ZPAQ_COMPRESS)
#define LZMA_COMPRESS(C) (!((C) & FLAG_NOT_LZMA))
#define LZMA_COMPRESS (!(control.flags & FLAG_NOT_LZMA))
#define SHOW_PROGRESS (control.flags & FLAG_SHOW_PROGRESS)
#define KEEP_FILES (control.flags & FLAG_KEEP_FILES)