diff options
| author | Daniel Baumann <mail@daniel-baumann.ch> | 2015-11-07 10:22:40 +0000 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2015-11-07 10:22:40 +0000 |
| commit | 121630cb0dafd7187bb66a8c0f1201744f1e163c (patch) | |
| tree | 7d595e83fb38cafb9e4201b979815fae85560ee9 /merge.cc | |
| parent | Adding debian version 1.14~rc2-1. (diff) | |
| download | lziprecover-121630cb0dafd7187bb66a8c0f1201744f1e163c.tar.xz lziprecover-121630cb0dafd7187bb66a8c0f1201744f1e163c.zip | |
Merging upstream version 1.14~rc3.
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
Diffstat (limited to 'merge.cc')
| -rw-r--r-- | merge.cc | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -135,7 +135,7 @@ int open_input_files( const std::vector< std::string > & filenames, else if( st_ino0 == in_stats.st_ino && st_dev0 == in_stats.st_dev ) { identical = true; break; } } - if( identical ) { show_error( "Two input files are the same." ); return 1; } + if( identical ) { show_error( "Two input files are the same." ); return 2; } isize = 0; for( unsigned i = 0; i < filenames.size(); ++i ) @@ -154,7 +154,7 @@ int open_input_files( const std::vector< std::string > & filenames, { show_error( "Input file is too short." ); return 2; } } else if( isize != tmp ) - { show_error( "Sizes of input files are different." ); return 1; } + { show_error( "Sizes of input files are different." ); return 2; } } for( unsigned i = 0; i < filenames.size(); ++i ) |