Merging upstream version 1.4.

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>

1 files changed, 3 insertions, 3 deletions

diff --git a/main.c b/main.c
index c2f3319..6142505 100644
--- a/main.c
+++ b/main.c
@@ -10,7 +10,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 */
 /*
-    Return values: 0 for a normal exit, 1 for environmental problems
+    Exit status: 0 for a normal exit, 1 for environmental problems
     (file not found, invalid flags, I/O errors, etc), 2 to indicate a
     corrupt or invalid input file, 3 for an internal consistency error
     (eg, bug) which caused pdlzip to panic.
@@ -45,7 +45,7 @@
 #endif
 
 #include "carg_parser.h"
-#include "clzip.h"
+#include "lzip.h"
 #include "LzmaDec.h"
 #include "LzmaEnc.h"
 
@@ -118,7 +118,7 @@ static void show_help( void )
           "scale optimal for all files. If your files are large, very repetitive,\n"
           "etc, you may need to use the --match-length and --dictionary-size\n"
           "options directly to achieve optimal performance.\n"
-          "\nReturn values: 0 for a normal exit, 1 for environmental problems (file\n"
+          "\nExit status: 0 for a normal exit, 1 for environmental problems (file\n"
           "not found, invalid flags, I/O errors, etc), 2 to indicate a corrupt or\n"
           "invalid input file, 3 for an internal consistency error (eg, bug) which\n"
           "caused pdlzip to panic.\n"