From 28aeb43eee402f13bec56cd16c1e075a26211260 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 8 Nov 2015 05:37:28 +0100 Subject: Merging upstream version 1.3~pre1. Signed-off-by: Daniel Baumann --- ztest.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ztest.cc') diff --git a/ztest.cc b/ztest.cc index 0b47fbf..86a8518 100644 --- a/ztest.cc +++ b/ztest.cc @@ -3,7 +3,7 @@ This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or + the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -238,13 +238,13 @@ int main( const int argc, const char * const argv[] ) case 'r': recursive = true; break; case 'v': if( verbosity < 4 ) ++verbosity; ztest_args.push_back( "-v" ); break; - case 'V': show_version( "Ztest" ); return 0; + case 'V': show_version(); return 0; case format_opt: format_index = parse_format_type( arg ); break; case bz2_opt: parse_compressor( arg, fmt_bz2, 1 ); break; case gz_opt: parse_compressor( arg, fmt_gz, 1 ); break; case lz_opt: parse_compressor( arg, fmt_lz, 1 ); break; case xz_opt: parse_compressor( arg, fmt_xz, 1 ); break; - default : internal_error( "uncaught option" ); + default : internal_error( "uncaught option." ); } } // end process options -- cgit v1.2.3