Merging upstream version 1.13~rc1.

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

1 files changed, 19 insertions, 19 deletions

diff --git a/testsuite/unzcrash.cc b/testsuite/unzcrash.cc
index 5fac783..b80580f 100644
--- a/testsuite/unzcrash.cc
+++ b/testsuite/unzcrash.cc
@@ -58,22 +58,22 @@ int verbosity = 0;
 void show_help() throw()
   {
   std::printf( "%s - A test program written to test robustness to\n", Program_name );
-  std::printf( "decompression of corrupted data.\n" );
-  std::printf( "\nUsage: %s [options] \"lzip -tv\" filename.lz\n", invocation_name );
-  std::printf( "\nThis program reads the specified file and then repeatedly decompresses\n" );
-  std::printf( "it, increasing 256 times each byte of the compressed data, so as to test\n" );
-  std::printf( "all possible one-byte errors. This should not cause any invalid memory\n" );
-  std::printf( "accesses. If it does, please, report it as a bug.\n" );
-  std::printf( "\nOptions:\n" );
-  std::printf( "  -h, --help                 display this help and exit\n" );
-  std::printf( "  -V, --version              output version information and exit\n" );
-  std::printf( "  -b, --bits=<n>[,n]         test <n>-bit errors instead of full byte\n" );
-  std::printf( "  -p, --position=<n>         first byte position to test\n" );
-  std::printf( "  -q, --quiet                suppress all messages\n" );
-  std::printf( "  -s, --size=<n>             number of byte positions to test\n" );
-  std::printf( "  -v, --verbose              be verbose (a 2nd -v gives more)\n" );
-  std::printf( "\nReport bugs to lzip-bug@nongnu.org\n" );
-  std::printf( "Lzip home page: http://www.nongnu.org/lzip/lzip.html\n" );
+  std::printf( "decompression of corrupted data.\n"
+               "\nUsage: %s [options] \"lzip -tv\" filename.lz\n", invocation_name );
+  std::printf( "\nThis program reads the specified file and then repeatedly decompresses\n"
+               "it, increasing 256 times each byte of the compressed data, so as to test\n"
+               "all possible one-byte errors. This should not cause any invalid memory\n"
+               "accesses. If it does, please, report it as a bug.\n"
+               "\nOptions:\n"
+               "  -h, --help                 display this help and exit\n"
+               "  -V, --version              output version information and exit\n"
+               "  -b, --bits=<n>[,<n>]...    test <n>-bit errors instead of full byte\n"
+               "  -p, --position=<bytes>     first byte position to test\n"
+               "  -q, --quiet                suppress all messages\n"
+               "  -s, --size=<bytes>         number of byte positions to test\n"
+               "  -v, --verbose              be verbose (a 2nd -v gives more)\n"
+               "\nReport bugs to lzip-bug@nongnu.org\n"
+               "Lzip home page: http://www.nongnu.org/lzip/lzip.html\n" );
   }
 
 
@@ -81,9 +81,9 @@ void show_version() throw()
   {
   std::printf( "%s %s\n", Program_name, PROGVERSION );
   std::printf( "Copyright (C) %s Antonio Diaz Diaz.\n", program_year );
-  std::printf( "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n" );
-  std::printf( "This is free software: you are free to change and redistribute it.\n" );
-  std::printf( "There is NO WARRANTY, to the extent permitted by law.\n" );
+  std::printf( "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+               "This is free software: you are free to change and redistribute it.\n"
+               "There is NO WARRANTY, to the extent permitted by law.\n" );
   }